[CP Staging] Fix greyed out workspace icon for workspace distance requests #33005

NikkiWines · 2023-12-13T19:49:23Z

Details

Use || instead of ?? since allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar can return ''

Fixed Issues

$ #32984
PROPOSAL: N/A

Tests

Create a NewDot workspace if you don't already have one.
Open the workspace chat for your workspace.
Press the +, Request Money, then Distance and complete a distance request.
Confirm the workspace avatar is visible in the conversation report preview

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as test steps

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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 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(theme.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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

(reported on Web only)

Screen.Recording.2023-12-13.at.11.44.16.mov

MacOS: Desktop

melvin-bot · 2023-12-13T19:49:28Z

@burczu 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-12-13T19:49:38Z

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

NikkiWines · 2023-12-13T19:59:45Z

Hah, and the linter is failing because we prefer?? to ||, though they aren't equivalent.

situchan · 2023-12-13T21:11:14Z

src/libs/ReportUtils.ts

@@ -1211,7 +1211,8 @@ function getDefaultWorkspaceAvatar(workspaceName?: string): React.FC<SvgProps> {

 function getWorkspaceAvatar(report: OnyxEntry<Report>): UserUtils.AvatarSource {
    const workspaceName = getPolicyName(report, false, allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]);
-    return allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar ?? getDefaultWorkspaceAvatar(workspaceName);
+    const avatar = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar;
+    return avatar ? avatar : getDefaultWorkspaceAvatar(workspaceName);


Suggested change

return avatar ? avatar : getDefaultWorkspaceAvatar(workspaceName);

return avatar && avatar !== '' ? avatar : getDefaultWorkspaceAvatar(workspaceName);

This looks ugly but inevitable to avoid ts error.
Otherwise disable lint on this line

Opted for following which I think is a little nicer

const avatar = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar ?? ''; return !isEmpty(avatar) ? avatar : getDefaultWorkspaceAvatar(workspaceName);

We try to avoid lodash, underscore in TS

https://github.com/Expensify/App/blob/main/contributingGuides/TS_STYLE.md#migration-guidelines

But seems like isEmpty is already used in this file

Hmm, I was also wondering whether isEmpty couldn't be replaced with avatar !== '' here (even after the latest change), but I'm only 90% sure this is equivalent. JavaScript's handling of emptiness/truthness scares me.

…x-workspace-icon

cubuspl42 · 2023-12-14T10:17:36Z

The code looks good, I'll start the testing & checklist 👍

Julesssss · 2023-12-14T10:21:22Z

Hey @cubuspl42, could you please @ me once thereview is complete and I'll get it merged and CP'd to prod. Thank you!

mountiny · 2023-12-14T11:38:38Z

This was a regression from the TS migration PR @kubabutkiewicz @shubham1206agra

cubuspl42 · 2023-12-14T11:49:32Z

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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

cubuspl42 · 2023-12-14T11:52:00Z

@Julesssss

melvin-bot · 2023-12-14T11:52:17Z

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

Julesssss · 2023-12-14T12:04:25Z

Wow, light mode is done

Julesssss · 2023-12-14T12:08:59Z

Cherry-picking now

[CP Staging] Fix greyed out workspace icon for workspace distance requests (cherry picked from commit 8c7ebaf)

OSBotify · 2023-12-14T12:11:46Z

✋ 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-12-14T12:34:16Z

🚀 Cherry-picked to staging by https://github.com/Julesssss in version: 1.4.12-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-12-14T15:26:28Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.12-2 🚀

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

use || instead of ?? to prevent greyed out icon

a66319c

NikkiWines self-assigned this Dec 13, 2023

NikkiWines requested a review from a team as a code owner December 13, 2023 19:49

melvin-bot bot requested review from burczu and removed request for a team December 13, 2023 19:49

NikkiWines requested review from francoisl and a team and removed request for burczu December 13, 2023 19:49

melvin-bot bot requested review from cubuspl42 and removed request for a team December 13, 2023 19:49

use linter friendly code

99fb4ab

situchan reviewed Dec 13, 2023

View reviewed changes

NikkiWines added 2 commits December 13, 2023 13:42

more linter

73768c4

Merge branch 'main' of https://github.com/Expensify/App into nikki-fi…

08a805b

…x-workspace-icon

cubuspl42 approved these changes Dec 14, 2023

View reviewed changes

melvin-bot bot requested a review from marcochavezf December 14, 2023 11:52

Julesssss requested review from Julesssss and removed request for francoisl and marcochavezf December 14, 2023 12:03

Julesssss approved these changes Dec 14, 2023

View reviewed changes

Julesssss merged commit 8c7ebaf into main Dec 14, 2023
16 of 17 checks passed

Julesssss deleted the nikki-fix-workspace-icon branch December 14, 2023 12:07

OSBotify pushed a commit that referenced this pull request Dec 14, 2023

Merge pull request #33005 from Expensify/nikki-fix-workspace-icon

e8b05c4

[CP Staging] Fix greyed out workspace icon for workspace distance requests (cherry picked from commit 8c7ebaf)

github-actions bot mentioned this pull request Dec 14, 2023

[$500] Deploy Checklist: New Expensify 2023-12-13 #32963

Closed

64 tasks

melvin-bot bot mentioned this pull request Dec 19, 2023

[HOLD for payment 2023-12-26] [$500] Web - Chat - Workspace avatar is greyed out in the conversation report preview #32984

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] Fix greyed out workspace icon for workspace distance requests #33005

[CP Staging] Fix greyed out workspace icon for workspace distance requests #33005

NikkiWines commented Dec 13, 2023 •

edited

Loading

melvin-bot bot commented Dec 13, 2023

melvin-bot bot commented Dec 13, 2023

NikkiWines commented Dec 13, 2023

situchan Dec 13, 2023

NikkiWines Dec 13, 2023

situchan Dec 13, 2023

situchan Dec 13, 2023

cubuspl42 Dec 14, 2023

cubuspl42 commented Dec 14, 2023

Julesssss commented Dec 14, 2023

mountiny commented Dec 14, 2023

cubuspl42 commented Dec 14, 2023

cubuspl42 commented Dec 14, 2023

melvin-bot bot commented Dec 14, 2023

Julesssss commented Dec 14, 2023

Julesssss commented Dec 14, 2023

OSBotify commented Dec 14, 2023

OSBotify commented Dec 14, 2023

OSBotify commented Dec 14, 2023

	return avatar ? avatar : getDefaultWorkspaceAvatar(workspaceName);
	return avatar && avatar !== '' ? avatar : getDefaultWorkspaceAvatar(workspaceName);

[CP Staging] Fix greyed out workspace icon for workspace distance requests #33005

[CP Staging] Fix greyed out workspace icon for workspace distance requests #33005

Conversation

NikkiWines commented Dec 13, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Dec 13, 2023

melvin-bot bot commented Dec 13, 2023

NikkiWines commented Dec 13, 2023

situchan Dec 13, 2023

Choose a reason for hiding this comment

NikkiWines Dec 13, 2023

Choose a reason for hiding this comment

situchan Dec 13, 2023

Choose a reason for hiding this comment

situchan Dec 13, 2023

Choose a reason for hiding this comment

cubuspl42 Dec 14, 2023

Choose a reason for hiding this comment

cubuspl42 commented Dec 14, 2023

Julesssss commented Dec 14, 2023

mountiny commented Dec 14, 2023

cubuspl42 commented Dec 14, 2023

Reviewer Checklist

Screenshots/Videos

cubuspl42 commented Dec 14, 2023

melvin-bot bot commented Dec 14, 2023

Julesssss commented Dec 14, 2023

Julesssss commented Dec 14, 2023

OSBotify commented Dec 14, 2023

OSBotify commented Dec 14, 2023

OSBotify commented Dec 14, 2023

NikkiWines commented Dec 13, 2023 •

edited

Loading