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.

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

Invites are collapsed incorrectly #6300

Merged
merged 4 commits into from
Jun 15, 2022

Conversation

gileluard
Copy link
Contributor

@gileluard gileluard commented Jun 15, 2022

resolves #4102

Now use sender avatar instead of the target avatar for collapsed membership cell

Simulator Screen Shot - iPhone 12 Pro - 2022-06-15 at 13 06 05

Simulator Screen Shot - iPhone 12 Pro - 2022-06-15 at 15 57 48

- use sender avatar instead of the target avatar for collapsed membership cell
@gileluard gileluard requested review from a team, ismailgulek and pixlwave and removed request for a team June 15, 2022 11:26
- fixed target ID for membership / join events
Copy link
Member

@pixlwave pixlwave left a comment

Choose a reason for hiding this comment

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

Looks good to me, although I've left a question inline.

}
else
{
targetId = event.sender;
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure I understand why this part is necessary. If the cell now always shows the sender avatar, then how come the targetId needs to be explicitly set to the sender here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're right. I just found this bug while digging. I actually hesitated to add this fix and I can revert it if you want.

Copy link
Contributor

@ismailgulek ismailgulek Jun 15, 2022

Choose a reason for hiding this comment

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

I'm not very sure what the issue requested with and the avatars should show the invited user not the invitee. “2 users invited” would be correct. I believe he wanted to have invited user instead of the inviter. If that assumption is correct, i think we'll need this part? (and keep using targetId for avatars)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ismailgulek I agree. I've just checked with android people and they confirmed the behaviour is the same. I'll check with the design team in this case.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ismailgulek I've checked with @amshakal and we'll display the avatar of the invitee in the collapsed membership cell even if it's a bit inconsistent with the expanded membership.

Copy link
Contributor

Choose a reason for hiding this comment

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

Great, thanks for checking.

@github-actions
Copy link

github-actions bot commented Jun 15, 2022

📱 Scan the QR code below to install the build for this PR.
🔒 This build is for internal testing purpose. Only devices listed in the ad-hoc provisioning profile can install Element Alpha.

QR code

If you can't scan the QR code you can install the build via this link: https://i.diawi.com/s4ZoZS

gileluard and others added 2 commits June 15, 2022 14:47
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
- Update after review
@gileluard gileluard merged commit 21e4706 into develop Jun 15, 2022
@gileluard gileluard deleted the gil/4102-Invites_are_collapsed_incorrectly branch June 15, 2022 18:11
stefanceriu pushed a commit that referenced this pull request Jun 28, 2022
* Invites are collapsed incorrectly

- use invitee avatar instead of the target avatar for collapsed membership cell
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Invites are collapsed incorrectly
3 participants