Only show Split Bill option in the user's own workspace chat #29551

youssef-lr · 2023-10-13T11:57:10Z

Details

Fixed Issues

$ https://expensify.slack.com/archives/C02NZ2HGJAZ/p1697196979533819?thread_ts=1697129448.032929&cid=C02NZ2HGJAZ

Tests

Sign up as a teacher using https://stagin.new.expensify.com/teachersunite/i-am-a-teacher, note down the principal email used
Navigate to the workspace chat and make sure you can see the 'Split bill'
Log in as the principal now and make sure you can't see the 'Split bill' option in the teacher's workspace chat.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Sign up as a teacher using https://stagin.new.expensify.com/teachersunite/i-am-a-teacher, note down the principal email used
Navigate to the workspace chat and make sure you can see the 'Split bill'
Log in as the principal now and make sure you can't see the 'Split bill' option in the teacher's workspace chat.

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

Screen.Recording.2023-10-16.at.15.23.14.mov

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2023-10-13T11:57:45Z

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

trjExpensify · 2023-10-13T13:19:03Z

👋 @youssef-lr can you link this to the relevant issue please, and then link it to the wave7 project board as HIGH. Thanks!

src/libs/ReportUtils.js

Co-authored-by: Vit Horacek <36083550+mountiny@users.noreply.github.com>

cloudflare-workers-and-pages · 2023-10-15T14:37:25Z

Deploying with Cloudflare Pages

Latest commit:	`a16d2f2`
Status:	✅ Deploy successful!
Preview URL:	https://e893682e.helpdot.pages.dev
Branch Preview URL:	https://youssef-hide-split-bill-appr.helpdot.pages.dev

View logs

src/libs/ReportUtils.js

Co-authored-by: Vit Horacek <36083550+mountiny@users.noreply.github.com>

situchan · 2023-10-15T22:02:11Z

Testing based on this hard coding

function isControlPolicyExpenseChat(report) {
    return isPolicyExpenseChat(report) // && getPolicyType(report, allPolicies) === CONST.POLICY.TYPE.CORPORATE;
}

situchan · 2023-10-15T22:29:03Z

It's old logic but can't Split bill and Request money option exist together?
I think both are possible if isOwnPolicyExpenseChat.
Currently not possible as early returned if split condition meets.

App/src/libs/ReportUtils.js

Lines 3416 to 3432 in a16d2f2

    
           if ( 
        
               (isChatRoom(report) && participants.length > 0) || 
        
               (hasMultipleParticipants && !isPolicyExpenseChat(report) && !isMoneyRequestReport(report)) || 
        
               (isControlPolicyExpenseChat(report) && report.isOwnPolicyExpenseChat) 
        
           ) { 
        
               return [CONST.IOU.MONEY_REQUEST_TYPE.SPLIT]; 
        
           } 
        
           // DM chats that only have 2 people will see the Send / Request money options. 
        
           // IOU and open or processing expense reports should show the Request option. 
        
           // Workspace chats should only see the Request money option or Split option in case of Control policies 
        
           return [ 
        
               ...(canRequestMoney(report, participants) ? [CONST.IOU.MONEY_REQUEST_TYPE.REQUEST] : []), 
        
               // Send money option should be visible only in DMs 
        
               ...(isChatReport(report) && !isPolicyExpenseChat(report) && hasSingleParticipantInReport ? [CONST.IOU.MONEY_REQUEST_TYPE.SEND] : []), 
        
           ];

youssef-lr · 2023-10-16T07:21:16Z

It's old logic but can't Split bill and Request money option exist together?

Yeah we'll add this change for all policies soon, currently we're only allowing this functionality in the Teachers Unite workspace.

MonilBhavsar · 2023-10-16T07:24:25Z

src/libs/ReportUtils.js

+    if (
+        (isChatRoom(report) && participants.length > 0) ||
+        (hasMultipleParticipants && !isPolicyExpenseChat(report) && !isMoneyRequestReport(report)) ||
+        (isControlPolicyExpenseChat(report) && report.isOwnPolicyExpenseChat)


Looks like isOwnPolicyExpenseChat is always set. Otherwise it can result into undefined. Right?

if this is check is true isControlPolicyExpenseChat then we'll always have that option set I think.

Looks good then 👍

MonilBhavsar

Could you also please link issue in gh?

situchan · 2023-10-16T08:17:36Z

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 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

Web

web1.mov

web2.mov

Mobile Web - Chrome

mchrome.mov

Mobile Web - Safari

msafari.mov

Desktop

desktop.mov

iOS

ios.mov

Android

android.mov

melvin-bot · 2023-10-16T08:19:47Z

@nkuoch 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-10-16T08:19:52Z

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

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

OSBotify · 2023-10-16T09:14:16Z

✋ 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-16T21:48:51Z

🚀 Deployed to staging by https://github.com/youssef-lr in version: 1.3.85-0 🚀

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

kavimuru · 2023-10-16T22:21:31Z

@youssef-lr Is this internal PR? I think applause shouldn't access the workspace as per this post

kavimuru · 2023-10-17T11:20:26Z

@francoisl as per this post, we are not sure if applause can test this PR. Could you confirm please?

MonilBhavsar · 2023-10-17T11:28:55Z

Have asked here https://expensify.slack.com/archives/C02NZ2HGJAZ/p1697542115604129?thread_ts=1697441707.475809&cid=C02NZ2HGJAZ

youssef-lr · 2023-10-17T11:41:48Z

It's a pass

OSBotify · 2023-10-17T23:13:36Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.85-4 🚀

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

OSBotify · 2023-10-18T00:00:00Z

🚀 Deployed to staging by https://github.com/youssef-lr in version: 1.3.86-0 🚀

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

OSBotify · 2023-10-18T23:57:30Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.86-5 🚀

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

Only show Split Bill option the user's own workspace chat

cfb2c48

youssef-lr self-assigned this Oct 13, 2023

youssef-lr requested a review from a team as a code owner October 13, 2023 11:57

melvin-bot bot removed the request for review from a team October 13, 2023 11:57

melvin-bot bot requested a review from MonilBhavsar October 13, 2023 11:57

youssef-lr requested a review from mountiny October 13, 2023 13:51

mountiny reviewed Oct 15, 2023

View reviewed changes

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

Update ReportUtils.js

e22831e

Co-authored-by: Vit Horacek <36083550+mountiny@users.noreply.github.com>

mountiny reviewed Oct 15, 2023

View reviewed changes

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

mountiny requested a review from situchan October 15, 2023 21:30

Update ReportUtils.js

a16d2f2

Co-authored-by: Vit Horacek <36083550+mountiny@users.noreply.github.com>

youssef-lr changed the title ~~[HOLD Auth#8915] Only show Split Bill option in the user's own workspace chat~~ Only show Split Bill option in the user's own workspace chat Oct 16, 2023

MonilBhavsar reviewed Oct 16, 2023

View reviewed changes

situchan approved these changes Oct 16, 2023

View reviewed changes

melvin-bot bot requested a review from nkuoch October 16, 2023 08:19

melvin-bot bot mentioned this pull request Oct 16, 2023

[HOLD for payment 2023-10-23] Payment issue for E/App PR#29551 #29658

Closed

MonilBhavsar approved these changes Oct 16, 2023

View reviewed changes

youssef-lr merged commit 2133e39 into main Oct 16, 2023
16 of 21 checks passed

youssef-lr deleted the youssef_hide_split_bill_approver branch October 16, 2023 09:08

OSBotify mentioned this pull request Oct 16, 2023

Deploy Checklist: New Expensify 2023-10-16 #29717

Closed

OSBotify mentioned this pull request Oct 17, 2023

Deploy Checklist: New Expensify 2023-10-17 #29837

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Only show Split Bill option in the user's own workspace chat #29551

Only show Split Bill option in the user's own workspace chat #29551

youssef-lr commented Oct 13, 2023 •

edited

Loading

melvin-bot bot commented Oct 13, 2023

trjExpensify commented Oct 13, 2023

cloudflare-workers-and-pages bot commented Oct 15, 2023 •

edited

Loading

situchan commented Oct 15, 2023

situchan commented Oct 15, 2023 •

edited

Loading

youssef-lr commented Oct 16, 2023

MonilBhavsar Oct 16, 2023

youssef-lr Oct 16, 2023

MonilBhavsar Oct 16, 2023

MonilBhavsar left a comment

situchan commented Oct 16, 2023

melvin-bot bot commented Oct 16, 2023

melvin-bot bot commented Oct 16, 2023

OSBotify commented Oct 16, 2023

OSBotify commented Oct 16, 2023

kavimuru commented Oct 16, 2023

kavimuru commented Oct 17, 2023

MonilBhavsar commented Oct 17, 2023

youssef-lr commented Oct 17, 2023

OSBotify commented Oct 17, 2023

OSBotify commented Oct 18, 2023

OSBotify commented Oct 18, 2023

Only show Split Bill option in the user's own workspace chat #29551

Only show Split Bill option in the user's own workspace chat #29551

Conversation

youssef-lr commented Oct 13, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 13, 2023

trjExpensify commented Oct 13, 2023

cloudflare-workers-and-pages bot commented Oct 15, 2023 • edited Loading

Deploying with Cloudflare Pages

situchan commented Oct 15, 2023

situchan commented Oct 15, 2023 • edited Loading

youssef-lr commented Oct 16, 2023

MonilBhavsar Oct 16, 2023

Choose a reason for hiding this comment

youssef-lr Oct 16, 2023

Choose a reason for hiding this comment

MonilBhavsar Oct 16, 2023

Choose a reason for hiding this comment

MonilBhavsar left a comment

Choose a reason for hiding this comment

situchan commented Oct 16, 2023

Reviewer Checklist

Screenshots/Videos

melvin-bot bot commented Oct 16, 2023

melvin-bot bot commented Oct 16, 2023

OSBotify commented Oct 16, 2023

OSBotify commented Oct 16, 2023

kavimuru commented Oct 16, 2023

kavimuru commented Oct 17, 2023

MonilBhavsar commented Oct 17, 2023

youssef-lr commented Oct 17, 2023

OSBotify commented Oct 17, 2023

OSBotify commented Oct 18, 2023

OSBotify commented Oct 18, 2023

youssef-lr commented Oct 13, 2023 •

edited

Loading

cloudflare-workers-and-pages bot commented Oct 15, 2023 •

edited

Loading

situchan commented Oct 15, 2023 •

edited

Loading