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

yuwenmemon · 2023-06-14T04:18:35Z

@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

melvin-bot · 2023-06-14T04:19:06Z

@eVoloshchak @youssef-lr One of you needs to 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]

thienlnam

More conflicts 😢

yuwenmemon · 2023-06-15T00:03:31Z

@thienlnam should be good now.

yuwenmemon · 2023-06-15T18:03:31Z

Placing a HOLD on this as we'll need to update this to use the Delegate's accountID.

https://expensify.slack.com/archives/C01GTK53T8Q/p1686827664566779

src/components/UserDetailsTooltip/index.js

yuwenmemon · 2023-06-15T21:49:56Z

Okay taking this off HOLD!

yuwenmemon · 2023-06-16T17:38:20Z

@thienlnam @eVoloshchak @youssef-lr Bump!

thienlnam

Code looks good besides that one comment - I can't currently run through testing though

thienlnam · 2023-06-16T18:00:58Z

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 = String(userDetails.login).trim() && !_.isEqual(userDetails.login, userDetails.displayName) ? Str.removeSMSDomain(userDetails.login) : '';


Same bad copy pasta

eVoloshchak · 2023-06-19T16:01:56Z

Don't have the bandwidth to test this unfortunately, asked for someone to take over on Slack

yuwenmemon · 2023-06-19T19:48:54Z

Updated!

src/components/UserDetailsTooltip/index.js

src/pages/home/report/ReportActionItemSingle.js

allroundexperts · 2023-06-19T21:54:07Z

@yuwenmemon I'll be taking this over from @eVoloshchak. Can you please assign this to me?

allroundexperts · 2023-06-19T21:54:34Z

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

yuwenmemon · 2023-06-21T17:50:10Z

@allroundexperts bump!

yuwenmemon · 2023-06-21T18:07:29Z

Ah fuck, mistook this PR for another one.

OSBotify · 2023-06-21T18:10:06Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

thienlnam · 2023-06-21T18:23:07Z

lmaooooooooo

yuwenmemon · 2023-06-21T18:50:18Z

Hush now @thienlnam

yuwenmemon · 2023-06-21T18:52:23Z

@allroundexperts Here is the resurrected PR if you could review that plz: #21246

My apologies!

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

🚀 Deployed to staging by https://github.com/yuwenmemon in version: 1.3.31-0 🚀

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

OSBotify · 2023-06-23T21:06:25Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.31-3 🚀

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

OSBotify · 2023-06-23T21:26:10Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.31-3 🚀

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

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

10b76ad

yuwenmemon requested a review from a team as a code owner June 14, 2023 04:18

yuwenmemon self-assigned this Jun 14, 2023

melvin-bot bot requested review from eVoloshchak and youssef-lr and removed request for a team June 14, 2023 04:19

yuwenmemon added 2 commits June 13, 2023 21:20

Fix conflicts

0cf3e67

Lint JS Code

5c56c2b

thienlnam reviewed Jun 14, 2023

View reviewed changes

yuwenmemon added 2 commits June 14, 2023 15:57

Fix conflicts

6fa2bac

Prettier

c7d7b63

Fix conflicts

89e56c2

yuwenmemon changed the title ~~Show the Copilot details if a delegate is set in a report action~~ [HOLD] Show the Copilot details if a delegate is set in a report action Jun 15, 2023

Merge branch 'main' of github.com:Expensify/App into yuwen-copilot

15d3110

hayata-suenaga reviewed Jun 15, 2023

View reviewed changes

src/components/UserDetailsTooltip/index.js Outdated Show resolved Hide resolved

yuwenmemon added 2 commits June 15, 2023 14:25

use accountIID instead of email

fa8ee9c

Fix string thing

5715622

yuwenmemon changed the title ~~[HOLD] Show the Copilot details if a delegate is set in a report action~~ Show the Copilot details if a delegate is set in a report action Jun 15, 2023

thienlnam reviewed Jun 16, 2023

View reviewed changes

Fix conflicts

5ce5188

Remove unneccessary String() call

77464ae

hayata-suenaga approved these changes Jun 19, 2023

View reviewed changes

src/components/UserDetailsTooltip/index.js Show resolved Hide resolved

src/pages/home/report/ReportActionItemSingle.js Show resolved Hide resolved

yuwenmemon requested review from allroundexperts and removed request for eVoloshchak June 20, 2023 16:16

Merge branch 'main' of github.com:Expensify/App into yuwen-copilot

7c2e373

yuwenmemon merged commit 003e5e5 into main Jun 21, 2023

yuwenmemon deleted the yuwen-copilot branch June 21, 2023 18:06

yuwenmemon mentioned this pull request Jun 21, 2023

[NoQA] Revert "Show the Copilot details if a delegate is set in a report action" #21240

Merged

55 tasks

OSBotify mentioned this pull request Jun 22, 2023

Deploy Checklist: New Expensify 2023-06-22 #21330

Closed

39 tasks

This was referenced Jun 23, 2023

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

Closed

[$1000] iOS - 2FA - 2FA displayed enabled after disabling it offline #21431

Closed

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

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

Uh oh!

Conversation

yuwenmemon commented Jun 14, 2023

Details

Fixed Issues

Tests/QA

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jun 14, 2023

Uh oh!

thienlnam left a comment

Choose a reason for hiding this comment

Uh oh!

yuwenmemon commented Jun 15, 2023

Uh oh!

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

Uh oh!

Uh oh!

Uh oh!

yuwenmemon commented Jun 15, 2023

Uh oh!

yuwenmemon commented Jun 16, 2023

Uh oh!

thienlnam left a comment

Choose a reason for hiding this comment

Uh oh!

thienlnam Jun 16, 2023

Choose a reason for hiding this comment

Uh oh!

eVoloshchak commented Jun 19, 2023

Uh oh!

yuwenmemon commented Jun 19, 2023

Uh oh!

Uh oh!

Uh oh!

allroundexperts commented Jun 19, 2023

Uh oh!

allroundexperts commented Jun 19, 2023

Reviewer Checklist

Screenshots/Videos

Uh oh!

yuwenmemon commented Jun 21, 2023

Uh oh!

yuwenmemon commented Jun 21, 2023

Uh oh!

OSBotify commented Jun 21, 2023

Uh oh!

thienlnam commented Jun 21, 2023

Uh oh!

yuwenmemon commented Jun 21, 2023

Uh oh!

yuwenmemon commented Jun 21, 2023

Uh oh!

OSBotify commented Jun 22, 2023

Uh oh!

OSBotify commented Jun 23, 2023

Uh oh!

OSBotify commented Jun 23, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

yuwenmemon commented Jun 15, 2023 •

edited

Loading