fix: solve missing avatar workspace logo issue #21657

developerdavi · 2023-06-27T01:29:27Z

Details

Fixed Issues

$ #19905
PROPOSAL: #19905 (comment)

Tests

Create a workspace
Invite a user
2.1. If you don't have a chat with the user, start one
Verify that the workspace logo icon appears correctly in the combined user avatar
Change the workspace logo to a valid image
Verify that the workspace logo icon appears correctly in the combined user avatar
The workspace icon should be consistent regardless of being a valid image or just the fallback icon, with same sizes, border and both be visibles

Verify that no errors appear in the JS console

Offline tests

None. The changes do not affect offline behavior.

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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

melvin-bot · 2023-06-27T01:29:32Z

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

github-actions · 2023-06-27T01:29:47Z

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

developerdavi · 2023-06-27T01:30:27Z

I have read the CLA Document and I hereby sign the CLA

rushatgabhane · 2023-06-29T03:51:47Z

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

@developerdavi there is a border box for custom avatars. And it doesn't look nice. Could we do something about it?

rushatgabhane · 2023-06-29T04:33:39Z

Note that we require all contributors to upload screenshot for all platforms. Please make sure to do that when you get the time, thanks!

developerdavi · 2023-06-29T15:05:10Z

@developerdavi there is a border box for custom avatars. And it doesn't look nice. Could we do something about it?

In which platform did that happen?

Note that we require all contributors to upload screenshot for all platforms. Please make sure to do that when you get the time, thanks!

The builds for iOS/Android do not have the workspace logo in the avatar, that's why I didn't include them, but I can provide.

rushatgabhane · 2023-06-29T15:23:19Z

In which platform did that happen?

it's on web and happens on uploading any jpg

The builds for iOS/Android do not have the workspace logo in the avatar, that's why I didn't include them, but I can provide.

makes sense! but we still require it 😅
i know it seems unnecessary but just in case something weird happens. it has saved us many times and reduced the number of regressions vs when we didn't have this requirement

developerdavi · 2023-07-02T00:35:55Z

@rushatgabhane fixed border issue + updated PR with other platforms screenshots.

Ps.: I could not run desktop (electron) by my side, could you help me or run by yours?

src/components/Avatar.js

developerdavi · 2023-07-03T12:38:11Z

thank you @rushatgabhane 🙌

rushatgabhane · 2023-07-03T15:29:33Z

@NikkiWines all yours!

NikkiWines

Looks good, couple of minor comments and you need to run npm run prettier

src/components/Avatar.js

src/styles/styles.js

developerdavi · 2023-07-03T17:43:51Z

@NikkiWines applied all recommendations.

developerdavi · 2023-07-03T17:45:18Z

ps.: maybe should be good to have prepush or precommit hooks to automatically run npm run prettier

NikkiWines

👍

melvin-bot · 2023-07-03T18:12:12Z

@NikkiWines looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

OSBotify · 2023-07-03T18:16:27Z

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

NikkiWines · 2023-07-03T18:41:43Z

?? All tests were passing 🤨

Untitled.mov

rushatgabhane · 2023-07-03T18:52:04Z

@NikkiWines yeah it's happening on all PRs. It's a bug with the bot

cc @mountiny

OSBotify · 2023-07-05T17:32:11Z

🚀 Deployed to staging by https://github.com/NikkiWines in version: 1.3.37-0 🚀

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

OSBotify · 2023-07-07T10:37:37Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.37-7 🚀

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

parasharrajat · 2023-07-26T18:52:25Z

Just noticed there is a regression from this PR #22467 (comment)

parasharrajat · 2023-07-26T19:00:22Z

src/components/Avatar.js


-    const iconStyle = props.imageStyles ? [StyleUtils.getAvatarStyle(props.size), styles.bgTransparent, ...props.imageStyles] : undefined;
+    const iconStyle = props.imageStyles && props.imageStyles.length ? [StyleUtils.getAvatarStyle(props.size), styles.bgTransparent, ...props.imageStyles] : undefined;


Previously, Avatar component used to apply this style by default to all View at line 107 but and similarly the imageStyles was applied to image at line 110. We migrated imageStyle properly but not the wrapper View style. Now, iconStyle will be undefined by default causing issues. as mentioned above.

Is there any issues if I revert the iconStyle to be same as before.

@rushatgabhane

I am waiting on this question to move forward on a PR. Looking forward to it. @rushatgabhane @developerdavi

@parasharrajat feel free to revert. it should be fine

fix: solve missing avatar workspace logo issue

21bf80d

developerdavi requested a review from a team as a code owner June 27, 2023 01:29

melvin-bot bot requested review from rushatgabhane and removed request for a team June 27, 2023 01:29

developerdavi mentioned this pull request Jun 27, 2023

[HOLD for payment 2023-07-14] [$1000] The workspace logo disappears if changed the workspace picture on combined user/workspace chat #19905

Closed

6 tasks

rushatgabhane suggested changes Jun 29, 2023

View reviewed changes

fix: change subscript avatar border styles

b6b43c6

rushatgabhane reviewed Jul 2, 2023

View reviewed changes

src/components/Avatar.js Outdated Show resolved Hide resolved

fix: remove inline styles

0d4d893

rushatgabhane approved these changes Jul 3, 2023

View reviewed changes

melvin-bot bot requested a review from NikkiWines July 3, 2023 04:50

NikkiWines requested changes Jul 3, 2023

View reviewed changes

src/components/Avatar.js Outdated Show resolved Hide resolved

src/styles/styles.js Outdated Show resolved Hide resolved

developerdavi added 3 commits July 3, 2023 14:39

fix(lint): add prettier changes

e904055

fix: remove greater than zero comparison

e835c83

fix: update no border radius style

0f26855

developerdavi requested a review from NikkiWines July 3, 2023 17:52

NikkiWines approved these changes Jul 3, 2023

View reviewed changes

NikkiWines merged commit e7a17f8 into Expensify:main Jul 3, 2023

melvin-bot bot added the Emergency label Jul 3, 2023

NikkiWines removed the Emergency label Jul 3, 2023

OSBotify mentioned this pull request Jul 5, 2023

Deploy Checklist: New Expensify 2023-07-05 #22282

Closed

58 tasks

parasharrajat mentioned this pull request Jul 26, 2023

Match Report Header and LHN Avatars #22467

Merged

63 tasks

parasharrajat reviewed Jul 26, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: solve missing avatar workspace logo issue #21657

fix: solve missing avatar workspace logo issue #21657

developerdavi commented Jun 27, 2023 •

edited

Loading

melvin-bot bot commented Jun 27, 2023

github-actions bot commented Jun 27, 2023 •

edited

Loading

developerdavi commented Jun 27, 2023

rushatgabhane commented Jun 29, 2023 •

edited

Loading

rushatgabhane left a comment

rushatgabhane commented Jun 29, 2023

developerdavi commented Jun 29, 2023

rushatgabhane commented Jun 29, 2023 •

edited

Loading

developerdavi commented Jul 2, 2023 •

edited

Loading

developerdavi commented Jul 3, 2023

rushatgabhane commented Jul 3, 2023

NikkiWines left a comment

developerdavi commented Jul 3, 2023

developerdavi commented Jul 3, 2023

NikkiWines left a comment

melvin-bot bot commented Jul 3, 2023

OSBotify commented Jul 3, 2023

NikkiWines commented Jul 3, 2023

rushatgabhane commented Jul 3, 2023 •

edited

Loading

OSBotify commented Jul 5, 2023

OSBotify commented Jul 7, 2023

parasharrajat commented Jul 26, 2023

parasharrajat Jul 26, 2023

parasharrajat Jul 26, 2023

rushatgabhane Jul 28, 2023


		const iconStyle = props.imageStyles ? [StyleUtils.getAvatarStyle(props.size), styles.bgTransparent, ...props.imageStyles] : undefined;
		const iconStyle = props.imageStyles && props.imageStyles.length ? [StyleUtils.getAvatarStyle(props.size), styles.bgTransparent, ...props.imageStyles] : undefined;

fix: solve missing avatar workspace logo issue #21657

fix: solve missing avatar workspace logo issue #21657

Conversation

developerdavi commented Jun 27, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 27, 2023

github-actions bot commented Jun 27, 2023 • edited Loading

developerdavi commented Jun 27, 2023

rushatgabhane commented Jun 29, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

rushatgabhane left a comment

Choose a reason for hiding this comment

rushatgabhane commented Jun 29, 2023

developerdavi commented Jun 29, 2023

rushatgabhane commented Jun 29, 2023 • edited Loading

developerdavi commented Jul 2, 2023 • edited Loading

developerdavi commented Jul 3, 2023

rushatgabhane commented Jul 3, 2023

NikkiWines left a comment

Choose a reason for hiding this comment

developerdavi commented Jul 3, 2023

developerdavi commented Jul 3, 2023

NikkiWines left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Jul 3, 2023

OSBotify commented Jul 3, 2023

NikkiWines commented Jul 3, 2023

rushatgabhane commented Jul 3, 2023 • edited Loading

OSBotify commented Jul 5, 2023

OSBotify commented Jul 7, 2023

parasharrajat commented Jul 26, 2023

parasharrajat Jul 26, 2023

Choose a reason for hiding this comment

parasharrajat Jul 26, 2023

Choose a reason for hiding this comment

rushatgabhane Jul 28, 2023

Choose a reason for hiding this comment

developerdavi commented Jun 27, 2023 •

edited

Loading

github-actions bot commented Jun 27, 2023 •

edited

Loading

rushatgabhane commented Jun 29, 2023 •

edited

Loading

rushatgabhane commented Jun 29, 2023 •

edited

Loading

developerdavi commented Jul 2, 2023 •

edited

Loading

rushatgabhane commented Jul 3, 2023 •

edited

Loading