update report preview message to use workspace name, not admin name #18945

0xmiros · 2023-05-15T11:27:40Z

Details

use workspace name for subscript avatar, tooltip
show {workspace name} owes $xxx message for all money requests in workspace chat

Fixed Issues

$ #18858
PROPOSAL: N/A

Tests

Login account A with policyExpenseChat beta
Invite B (with policyExpenseChat beta) to any workspace
Login account B on another device
On invited workspace chat, request money
Verify that in IOU message, shows workspace avatar for subscript, workspace name for tooltip, report preview message says {workspace name} owes xxx
Also verify 5. in "workspace chat with B" on account A

NOTE: A is admin, B is invited member (not admin)

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

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

desktop-web.mov

Mobile Web - Chrome

Mobile Web - Safari

Desktop

desktop-web.mov

iOS

Android

melvin-bot · 2023-05-15T11:27:46Z

@roryabraham @mananjadhav 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]

Julesssss · 2023-05-15T13:55:56Z

src/components/ReportActionItem/ReportPreview.js

@@ -89,7 +99,7 @@ const defaultProps = {
 const ReportPreview = (props) => {
    const reportAmount = CurrencyUtils.convertToDisplayString(ReportUtils.getMoneyRequestTotal(props.iouReport), props.iouReport.currency);
    const managerEmail = props.iouReport.managerEmail || '';
-    const managerName = ReportUtils.getDisplayNameForParticipant(managerEmail, true);
+    const managerName = ReportUtils.isPolicyExpenseChat(props.chatReport) ? ReportUtils.getPolicyName(props.chatReport) : ReportUtils.getDisplayNameForParticipant(managerEmail, true);


We're pulling the chatReport object to simply get the managerName? Is it not possible to get this from the IOUReport?

That's ideal but this is current IOUReport data:

Ah, right. What about the reportAction? IOUActions should contain participants under action.originalMessage.participants

still don't have chat report detail, only IDs

Currently __fake__ is in participants which is bug I mentioned and blocking test.

Hmm, that seems like a separate issue to me. But okay, we can follow up with that fix.

trjExpensify · 2023-05-15T17:58:05Z

Is anyone against me putting the CP Staging label on this, given that it's pretty high value polish for EC3 to distinguish the workspace case from consumer? Let's give it the best chance of making it.

github-actions · 2023-05-16T08:00:08Z

⚠️ ⚠️ Heads up! This pull request has the CP Staging label ⚠️ ⚠️
If you applied the CP Staging label before the PR was merged, the PR will be be immediately deployed to staging even if the open StagingDeployCash deploy checklist is locked.
However if you applied the CP Staging after the PR was merged it's possible it won't be CP'ed automatically. If you need it to be CP'ed to staging, tag a member of @Expensify/mobile-deployers to CP it manually, otherwise you can wait for it to go out with the next deploy.

Julesssss · 2023-05-16T08:00:22Z

Ready for review @mananjadhav

rushatgabhane · 2023-05-16T08:06:51Z

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

rushatgabhane · 2023-05-16T08:14:33Z

src/pages/home/report/ReportActionItemSingle.js

@@ -88,9 +88,9 @@ const ReportActionItemSingle = (props) => {
                    {props.shouldShowSubscriptAvatar ? (
                        <SubscriptAvatar
                            mainAvatar={{source: avatarSource, type: CONST.ICON_TYPE_AVATAR}}
-                            secondaryAvatar={ReportUtils.getIcons(props.report, {})[0]}
+                            secondaryAvatar={ReportUtils.getIcons(props.report, {})[props.report.isOwnPolicyExpenseChat ? 0 : 1]}


@0xmiroslav this code needs a comment explaining why and what we're doing. It seems arbitrary to me

I'm guessing index 0 has your own icon, and index 1 has the workspace icon.

App/src/libs/ReportUtils.js

Lines 753 to 755 in 50ed3e6

// If the user is an admin, return avatar source of the other participant of the report

// (their workspace chat) and the avatar source of the workspace

return [adminIcon, workspaceIcon];

shouldShowSubscriptAvatar is only for workspace chat (policyExpenseChat).
If isOwnPolicyExpenseChat, it returns array with only 1 element - workspace icon:

App/src/libs/ReportUtils.js

Line 854 in d28ec8f

return [result];

rushatgabhane · 2023-05-16T08:42:25Z

I'm using the Staging API.

Bug: can't see workspace owner's avatar and name when creating a comment

Steps:

Create a workspace
Go to workspace room
Send a message

mountiny · 2023-05-16T10:33:07Z

Rushat, I had the same issue on staging now when I created a Group and sent message my avatar was missing so maybe its not related

Julesssss · 2023-05-16T10:51:59Z

Hey @rushatgabhane,

Good spot. I think we've seen that elsewhere so we can ignore that for this PR review 👍

rushatgabhane · 2023-05-16T11:06:19Z

oh okayy, thanks!

rushatgabhane · 2023-05-16T11:45:58Z

@0xmiroslav the preview message is overflowing for long workspace names
@luacmartins @Julesssss should we fix it in this PR? It doesn't seem related, but just confirming!

rushatgabhane

LGTM!

@Julesssss can be merged

0xmiros · 2023-05-16T11:50:28Z

@0xmiroslav the preview message is overflowing for long workspace names @luacmartins @Julesssss should we fix it in this PR? It doesn't seem related, but just confirming!

I suggest to separate issues which already happen on main.
I can raise follow-up PR if needed.

rushatgabhane · 2023-05-16T12:05:22Z

@0xmiroslav we have it covered. There's a PR for it - #18933

0xmiros · 2023-05-16T12:06:08Z

@0xmiroslav we have it covered. There's a PR for it - #18933

Nice find!

…pace-name update report preview message to use workspace name, not admin name (cherry picked from commit 444a55b)

…-18945 🍒 Cherry pick PR #18945 to staging 🍒

OSBotify · 2023-05-16T13:39:42Z

🚀 Cherry-picked to staging by https://github.com/Julesssss in version: 1.3.14-8 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2023-05-17T00:18:10Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.3.14-14 🚀

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

OSBotify · 2023-06-15T01:30:03Z

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.3.28-2 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2023-06-16T18:47:52Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.28-5 🚀

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

update report preview message to use workspace name, not admin name

8b30293

0xmiros requested a review from a team as a code owner May 15, 2023 11:27

melvin-bot bot requested review from mananjadhav and roryabraham and removed request for a team May 15, 2023 11:27

0xmiros mentioned this pull request May 15, 2023

[HOLD for payment 2023-05-25] [HOLD for payment 2023-05-23] [$1000] [Manual Requests] Update the report preview message to use workspaceName, not the admin name. #18858

Closed

Julesssss assigned 0xmiros May 15, 2023

Julesssss reviewed May 15, 2023

View reviewed changes

Julesssss added the CP Staging label May 16, 2023

Julesssss approved these changes May 16, 2023

View reviewed changes

rushatgabhane reviewed May 16, 2023

View reviewed changes

luacmartins self-requested a review May 16, 2023 11:29

rushatgabhane approved these changes May 16, 2023

View reviewed changes

Julesssss approved these changes May 16, 2023

View reviewed changes

Julesssss merged commit 444a55b into Expensify:main May 16, 2023

OSBotify pushed a commit that referenced this pull request May 16, 2023

Merge pull request #18945 from 0xmiroslav/fix/18858-iou-preview-works…

fe85b33

…pace-name update report preview message to use workspace name, not admin name (cherry picked from commit 444a55b)

OSBotify mentioned this pull request May 16, 2023

🍒 Cherry pick PR #18945 to staging 🍒 #19009

Merged

OSBotify added a commit that referenced this pull request May 16, 2023

Merge pull request #19009 from Expensify/OSBotify-cherry-pick-staging…

14d474f

…-18945 🍒 Cherry pick PR #18945 to staging 🍒

OSBotify mentioned this pull request May 16, 2023

Deploy Checklist: New Expensify 2023-05-15 #18938

Closed

67 tasks

OSBotify mentioned this pull request May 17, 2023

Deploy Checklist: New Expensify 2023-05-16 #19088

Closed

71 tasks

OSBotify mentioned this pull request Jun 15, 2023

Deploy Checklist: New Expensify 2023-06-14 #20782

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update report preview message to use workspace name, not admin name #18945

update report preview message to use workspace name, not admin name #18945

0xmiros commented May 15, 2023

melvin-bot bot commented May 15, 2023

Julesssss May 15, 2023

0xmiros May 15, 2023

Julesssss May 15, 2023 •

edited

Loading

0xmiros May 15, 2023

Julesssss May 15, 2023

trjExpensify commented May 15, 2023

github-actions bot commented May 16, 2023

Julesssss commented May 16, 2023

rushatgabhane commented May 16, 2023 •

edited

Loading

rushatgabhane May 16, 2023 •

edited

Loading

rushatgabhane May 16, 2023 •

edited

Loading

This comment was marked as off-topic.

0xmiros May 16, 2023

rushatgabhane commented May 16, 2023 •

edited

Loading

mountiny commented May 16, 2023 •

edited

Loading

Julesssss commented May 16, 2023

rushatgabhane commented May 16, 2023

rushatgabhane commented May 16, 2023 •

edited

Loading

rushatgabhane left a comment •

edited

Loading

0xmiros commented May 16, 2023

rushatgabhane commented May 16, 2023

0xmiros commented May 16, 2023

OSBotify commented May 16, 2023

OSBotify commented May 17, 2023

OSBotify commented Jun 15, 2023

OSBotify commented Jun 16, 2023

	// If the user is an admin, return avatar source of the other participant of the report
	// (their workspace chat) and the avatar source of the workspace
	return [adminIcon, workspaceIcon];

update report preview message to use workspace name, not admin name #18945

update report preview message to use workspace name, not admin name #18945

Conversation

0xmiros commented May 15, 2023

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 15, 2023

Julesssss May 15, 2023

Choose a reason for hiding this comment

0xmiros May 15, 2023

Choose a reason for hiding this comment

Julesssss May 15, 2023 • edited Loading

Choose a reason for hiding this comment

0xmiros May 15, 2023

Choose a reason for hiding this comment

Julesssss May 15, 2023

Choose a reason for hiding this comment

trjExpensify commented May 15, 2023

github-actions bot commented May 16, 2023

Julesssss commented May 16, 2023

rushatgabhane commented May 16, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

rushatgabhane May 16, 2023 • edited Loading

Choose a reason for hiding this comment

rushatgabhane May 16, 2023 • edited Loading

Choose a reason for hiding this comment

This comment was marked as off-topic.

0xmiros May 16, 2023

Choose a reason for hiding this comment

rushatgabhane commented May 16, 2023 • edited Loading

mountiny commented May 16, 2023 • edited Loading

Julesssss commented May 16, 2023

rushatgabhane commented May 16, 2023

rushatgabhane commented May 16, 2023 • edited Loading

rushatgabhane left a comment • edited Loading

Choose a reason for hiding this comment

0xmiros commented May 16, 2023

rushatgabhane commented May 16, 2023

0xmiros commented May 16, 2023

OSBotify commented May 16, 2023

OSBotify commented May 17, 2023

OSBotify commented Jun 15, 2023

OSBotify commented Jun 16, 2023

Julesssss May 15, 2023 •

edited

Loading

rushatgabhane commented May 16, 2023 •

edited

Loading

rushatgabhane May 16, 2023 •

edited

Loading

rushatgabhane May 16, 2023 •

edited

Loading

rushatgabhane commented May 16, 2023 •

edited

Loading

mountiny commented May 16, 2023 •

edited

Loading

rushatgabhane commented May 16, 2023 •

edited

Loading

rushatgabhane left a comment •

edited

Loading