Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Conversation

RinkiyaKeDad
Copy link
Contributor

@RinkiyaKeDad RinkiyaKeDad commented Nov 24, 2020

Fixes element-hq/element-web#1568

I've added code to conditionally change the avatar which is shown. Please let me know if any changes are to be made. Much thanks.

Signed-off-by: Arsh Sharma arshsharma461@gmail.com

@t3chguy
Copy link
Member

t3chguy commented Nov 24, 2020

Definite has a few style nits where it does not look like the code around it, instead of having a huge if/else for the whole <MemberAvatar, maybe just have it set a variable member and use that in a single <MemberAvatar for better readability

viewUserOnClick={true}
/>
</div>
);
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
);
);
@t3chguy t3chguy added the Z-Community-PR Issue is solved by a community member's PR label Nov 25, 2020
@RinkiyaKeDad
Copy link
Contributor Author

Thanks for reviewing @t3chguy. I've commited the suggestions you left. Please do let me know if some other changes are to be made.

@t3chguy
Copy link
Member

t3chguy commented Nov 26, 2020

Can confirm this works

image

Comment on lines 749 to 750
// set member to receiver (target) if it is a 3PID invite
// so that the correct avatar is shown
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// set member to receiver (target) if it is a 3PID invite
// so that the correct avatar is shown
// set member to receiver (target) if it is a 3PID invite
// so that the correct avatar is shown as the text is
// `$target accepted the invitation for $email`
Copy link
Member

@t3chguy t3chguy left a comment

Choose a reason for hiding this comment

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

LGTM otherwise

@t3chguy
Copy link
Member

t3chguy commented Nov 30, 2020

Thanks for your contribution!!

@t3chguy t3chguy merged commit d4ed4a1 into matrix-org:develop Nov 30, 2020
@RinkiyaKeDad RinkiyaKeDad deleted the avatar-fix branch November 30, 2020 09:59
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Z-Community-PR Issue is solved by a community member's PR

2 participants