-
Notifications
You must be signed in to change notification settings - Fork 3.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[CP Staging] Re-add old-style default avatar prefix #18369
Conversation
@joelbettner @fedirjh 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] |
This is a quick change, we'll keep the PR internal. Thanks! |
|
Reviewer Checklist
Screenshots/VideosMobile Web - ChromeMobile Web - SafariDesktopiOSAndroid |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested well for both old and new avatars!
src/libs/ReportUtils.js
Outdated
@@ -602,7 +602,7 @@ function getOldDotDefaultAvatar(login = '') { | |||
* @returns {Boolean} | |||
*/ | |||
function isDefaultAvatar(avatarURL) { | |||
if (_.isString(avatarURL) && (avatarURL.includes('images/avatars/default-avatar_') || avatarURL.includes('images/avatars/user/default'))) { | |||
if (_.isString(avatarURL) && (avatarURL.includes('images/avatars/avatar_') || avatarURL.includes('images/avatars/default-avatar_') || avatarURL.includes('images/avatars/user/default'))) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@francoisl to fix linting
if (_.isString(avatarURL) && (avatarURL.includes('images/avatars/avatar_') || avatarURL.includes('images/avatars/default-avatar_') || avatarURL.includes('images/avatars/user/default'))) { | |
if (_.isString(avatarURL) && ( | |
avatarURL.includes('images/avatars/avatar_') | |
|| avatarURL.includes('images/avatars/default-avatar_') | |
|| avatarURL.includes('images/avatars/user/default')) | |
) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, sorry Github didn't notify me of your suggestion before I pushed my update. I went for something a little different, but we can use your suggestion if you think it's better?
@@ -602,7 +602,13 @@ function getOldDotDefaultAvatar(login = '') { | |||
* @returns {Boolean} | |||
*/ | |||
function isDefaultAvatar(avatarURL) { | |||
if (_.isString(avatarURL) && (avatarURL.includes('images/avatars/default-avatar_') || avatarURL.includes('images/avatars/user/default'))) { | |||
if (_.isString(avatarURL) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I broke this down on multiple lines for the linter. I followed the same pattern we do here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TBH, I think it is a stupid linter rule for code. I understand it for comments, but code should be able to be longer than 190 characters per line. But...that's a topic for a different day and time. :)
[CP Staging] Re-add old-style default avatar prefix (cherry picked from commit 9b163cf)
…-18369 🍒 Cherry pick PR #18369 to staging 🍒
🚀 Cherry-picked to staging by https://github.com/joelbettner in version: 1.3.9-18 🚀
@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes. |
🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.3.28-2 🚀
@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes. |
🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.28-5 🚀
|
Follow-up of #18361
Details
Some accounts have a hardcoded old-style avatar URL NVP, which we're not detecting anymore since #18361
Fixed Issues
$ #18304
Tests / QA Steps
Store.PersonalDetails.updatePersonalDetails({avatar:'https://d2k5nsl2zxldvw.cloudfront.net/images/avatars/avatar_3.png',firstName:'AA', lastName:'BB'});
Offline tests
N/A, you need to be online to sign in
QA Steps
PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectiontoggleReport
and notonIconClick
)myBool && <MyComponent />
.src/languages/*
files and using the translation methodWaiting for Copy
label for a copy review on the original GH to get the correct copy.STYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)/** comment above it */
this
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor)this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)ScrollView
component to make it scrollable when more elements are added to the page.main
branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTest
steps.Screenshots/Videos
Web
Mobile Web - Chrome
Mobile Web - Safari
Desktop
iOS
Android