Show the Copilot details if a delegate is set in a report action #21246

yuwenmemon · 2023-06-21T18:51:28Z

@thienlnam plz review
cc @hayata-suenaga

Details

If an action was taken by a copilot, record that and show it in the display name of the user making the action.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/288976

Tests/QA

In www.expensify.com, login as a copilot for a policy admin
Go to a policy disable and enable some categories on behalf of the admin as copilot while in copilot mode
Go to new.expensify.com
Go to the #admins chat room for that same policy
Verify that the actions taken by the copilot show as from them, with their avatar, and the other user is referenced in a parenthetical (as copilot for XXXX)

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

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

…in a report action""

melvin-bot · 2023-06-21T18:51:33Z

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

allroundexperts · 2023-06-21T19:41:41Z

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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

allroundexperts · 2023-06-21T19:44:11Z

In www.expensify.com, login as a copilot for a policy admin

@yuwenmemon How can I do that? Is there an account I can use?

hayata-suenaga

code LGTM! I haven't tested this

I gonna rely on @allroundexperts for testing 🙇

yuwenmemon · 2023-06-22T19:14:55Z

@allroundexperts

You can create a co-pilot for a user in www.expensify.com by following these instructions: https://community.expensify.com/discussion/4783/how-to-add-or-remove-a-copilot

allroundexperts · 2023-06-23T23:15:00Z

@yuwenmemon Can you please resolve the conflicts?

allroundexperts · 2023-06-23T23:39:20Z

Also, @yuwenmemon, I'm getting this when trying to go to the categories page:

Screen.Recording.2023-06-24.at.4.37.15.AM.mov

yuwenmemon · 2023-06-27T00:07:33Z

@allroundexperts You'll need to test with a Control or Collect (paid) policy, not a workspace

yuwenmemon · 2023-06-27T00:30:39Z

Updated and retested!

allroundexperts · 2023-06-28T10:42:46Z

src/components/UserDetailsTooltip/index.js


 function UserDetailsTooltip(props) {
    const userDetails = lodashGet(props.personalDetailsList, props.accountID, props.fallbackUserDetails);
+    let userDisplayName = userDetails.displayName ? userDetails.displayName.trim() : '';


`(userDetails.displayName || '').trim()

allroundexperts · 2023-06-28T10:45:08Z

src/components/UserDetailsTooltip/index.js

 function UserDetailsTooltip(props) {
    const userDetails = lodashGet(props.personalDetailsList, props.accountID, props.fallbackUserDetails);
+    let userDisplayName = userDetails.displayName ? userDetails.displayName.trim() : '';
+    let userLogin = (userDetails.login || '').trim() && !_.isEqual(userDetails.login, userDetails.displayName) ? Str.removeSMSDomain(userDetails.login) : '';


_.isEqual for string comparison is an overkill. No?

allroundexperts

LGTM. Tests well.

melvin-bot · 2023-06-28T17:11:36Z

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

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

hayata-suenaga · 2023-06-28T19:45:15Z

will wait for fixes suggested by @allroundexperts before merge

…ert-20738-yuwen-copilot

yuwenmemon · 2023-06-29T16:21:38Z

Updated!

OSBotify · 2023-06-29T17:18:22Z

✋ 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-06-29T20:37:18Z

🚀 Deployed to staging by https://github.com/hayata-suenaga in version: 1.3.35-0 🚀

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

Julesssss · 2023-07-03T13:21:53Z

Seems like you're already on it, but for historical records, this blocker was raised during testing: #21970

OSBotify · 2023-07-03T14:35:09Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.35-5 🚀

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

OSBotify · 2023-07-03T15:17:44Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.35-5 🚀

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

Revert "[NoQA] Revert "Show the Copilot details if a delegate is set …

4382c23

…in a report action""

yuwenmemon requested a review from allroundexperts June 21, 2023 18:51

yuwenmemon requested a review from a team as a code owner June 21, 2023 18:51

melvin-bot bot requested review from mollfpr and removed request for a team June 21, 2023 18:51

yuwenmemon removed the request for review from mollfpr June 21, 2023 18:51

yuwenmemon mentioned this pull request Jun 21, 2023

Show the Copilot details if a delegate is set in a report action #20738

Merged

56 tasks

hayata-suenaga self-requested a review June 22, 2023 16:57

hayata-suenaga previously approved these changes Jun 22, 2023

View reviewed changes

Fix conflicts

b89650c

yuwenmemon dismissed hayata-suenaga’s stale review via b89650c June 27, 2023 00:25

yuwenmemon added 2 commits June 26, 2023 17:28

Fix bad conflict fix

8647892

Linter

ba14361

hayata-suenaga approved these changes Jun 27, 2023

View reviewed changes

Nodebrute mentioned this pull request Jun 27, 2023

[$1000] #admins room - Other user is not referenced in a parenthetical (as copilot for XXXX) #21428

Closed

6 tasks

allroundexperts reviewed Jun 28, 2023

View reviewed changes

allroundexperts approved these changes Jun 28, 2023

View reviewed changes

melvin-bot bot mentioned this pull request Jun 28, 2023

Payment issue for E/App PR#21246 #21823

Closed

Merge branch 'main' of github.com:Expensify/App into revert-21240-rev…

f34e94d

…ert-20738-yuwen-copilot

hayata-suenaga merged commit 76a8a98 into main Jun 29, 2023

hayata-suenaga deleted the revert-21240-revert-20738-yuwen-copilot branch June 29, 2023 17:13

yuwenmemon restored the revert-21240-revert-20738-yuwen-copilot branch June 29, 2023 17:18

OSBotify mentioned this pull request Jun 29, 2023

Deploy Checklist: New Expensify 2023-06-29 #21911

Closed

51 tasks

lanitochka17 mentioned this pull request Jun 30, 2023

[HOLD for payment 2023-07-12] [HOLD for payment 2023-07-10] Copilot - Copilot and regular account actions are displayed the same in #admins room #21970

Closed

6 tasks

manjesh-yadav mentioned this pull request Jul 2, 2023

Fix phone number show twice in tooltip #21893

Merged

57 tasks

0xmiroslav mentioned this pull request Jul 3, 2023

Update Avatar Patterns for LHN #20512

Merged

Julesssss assigned yuwenmemon Jul 3, 2023

Show the Copilot details if a delegate is set in a report action #21246

Show the Copilot details if a delegate is set in a report action #21246

Uh oh!

Conversation

yuwenmemon commented Jun 21, 2023

Details

Fixed Issues

Tests/QA

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jun 21, 2023

Uh oh!

allroundexperts commented Jun 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

allroundexperts commented Jun 21, 2023

Uh oh!

hayata-suenaga left a comment

Choose a reason for hiding this comment

Uh oh!

yuwenmemon commented Jun 22, 2023

Uh oh!

allroundexperts commented Jun 23, 2023

Uh oh!

allroundexperts commented Jun 23, 2023

Uh oh!

yuwenmemon commented Jun 27, 2023

Uh oh!

yuwenmemon commented Jun 27, 2023

Uh oh!

allroundexperts Jun 28, 2023

Choose a reason for hiding this comment

Uh oh!

allroundexperts Jun 28, 2023

Choose a reason for hiding this comment

Uh oh!

allroundexperts left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Jun 28, 2023

Uh oh!

hayata-suenaga commented Jun 28, 2023

Uh oh!

yuwenmemon commented Jun 29, 2023

Uh oh!

OSBotify commented Jun 29, 2023

Uh oh!

OSBotify commented Jun 29, 2023

Uh oh!

Julesssss commented Jul 3, 2023

Uh oh!

OSBotify commented Jul 3, 2023

Uh oh!

OSBotify commented Jul 3, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

allroundexperts commented Jun 21, 2023 •

edited

Loading