Skip to content
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.

Sign up for GitHub

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

fix: avatar not changed in tooltip when updating avatar #20713

Merged
merged 6 commits into from
Jun 14, 2023
Merged

fix: avatar not changed in tooltip when updating avatar #20713

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
270ce3b
fix: update PERSONAL_DETAILS_LIST when updating avatar
sangar-1028 Jun 13, 2023
2283c67
fix: update avatar when deleting avatar
sangar-1028 Jun 13, 2023
e41f473
fix: remove avatar for NewDot
sangar-1028 Jun 13, 2023
9676093
fix: accountID validation added
sangar-1028 Jun 14, 2023
14e8999
fix: lint error
sangar-1028 Jun 14, 2023
1c3a20d
fix: use of UserUtils.getAvatar
sangar-1028 Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 86 additions & 25 deletions src/libs/actions/PersonalDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ function updateAvatar(file) {
},
},
];

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed.

const successData = [
{
onyxMethod: Onyx.METHOD.MERGE,
Expand Down Expand Up @@ -408,6 +409,48 @@ function updateAvatar(file) {
},
];

const accountID = lodashGet(personalDetails, [currentUserEmail, 'accountID'], '');
if (accountID) {
optimisticData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
value: {
[accountID]: {
avatar: file.uri,
errorFields: {
avatar: null,
},
pendingFields: {
avatar: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
},
},
},
});
successData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
value: {
[accountID]: {
pendingFields: {
avatar: null,
},
},
},
});
failureData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
value: {
[accountID]: {
avatar: personalDetails[currentUserEmail].avatar,
pendingFields: {
avatar: null,
},
},
},
});
}

API.write('UpdateUserAvatar', {file}, {optimisticData, successData, failureData});
}

Expand All @@ -416,36 +459,54 @@ function updateAvatar(file) {
*/
function deleteAvatar() {
// We want to use the old dot avatar here as this affects both platforms.
const defaultAvatar = UserUtils.getDefaultAvatarURL(currentUserEmail);
const defaultAvatar = UserUtils.getDefaultAvatarURL(currentUserEmail, true);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@s-alves10 Let's not try to change it to true. I'm sure we had it as false due to a reason.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If set to false, default user avatar URL is different than the ones that are current using. When user removes avatar, there is an inconsistency. You can easily check that.

Please let me know if you still want to change it

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can see the in-consistency, but why does it happen for the avatar in the tooltip and not with avatars elsewhere?

Copy link
Contributor Author

@dummy-1111 dummy-1111 Jun 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other avatars get avatar URL with the below function.

App/src/libs/UserUtils.js

Lines 150 to 152 in 0a471b0

function getAvatar(avatarURL, login) {
return isDefaultAvatar(avatarURL) ? getDefaultAvatar(login) : avatarURL;
}

This function corrects this error, but it seems redundant. I think the current change doesn't affect this function

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use this function inside our tooltip like we are using elsewhere? This will prevent us from using true here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@s-alves10 Any update on above?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome. Thanks!


API.write(
'DeleteUserAvatar',
{},
const optimisticData = [
{
optimisticData: [
{
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.PERSONAL_DETAILS,
value: {
[currentUserEmail]: {
avatar: defaultAvatar,
},
},
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.PERSONAL_DETAILS,
value: {
[currentUserEmail]: {
avatar: defaultAvatar,
},
],
failureData: [
{
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.PERSONAL_DETAILS,
value: {
[currentUserEmail]: {
avatar: personalDetails[currentUserEmail].avatar,
},
},
},
},
];
const failureData = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.PERSONAL_DETAILS,
value: {
[currentUserEmail]: {
avatar: personalDetails[currentUserEmail].avatar,
},
],
},
},
);
];

const accountID = lodashGet(personalDetails, [currentUserEmail, 'accountID'], '');
if (accountID) {
optimisticData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
value: {
[personalDetails[currentUserEmail].accountID]: {
avatar: defaultAvatar,
},
},
});
failureData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
value: {
[personalDetails[currentUserEmail].accountID]: {
avatar: personalDetails[currentUserEmail].avatar,
},
},
});
}

API.write('DeleteUserAvatar', {}, {optimisticData, failureData});
}

/**
Expand Down