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

Display a warning if a third party invite for a room was sent to an address that is not bound publicly to our account #233

Merged
merged 6 commits into from
Mar 18, 2016

Conversation

dbkr
Copy link
Member

@dbkr dbkr commented Mar 18, 2016

Fixes element-hq/element-web#924
Requires matrix-org/matrix-js-sdk#113

Could use styling magic from @ara4n

Pass the invited email through to RoomPreviewBar, display it in a temporary way currently.

Remove a condition from RoomView render that appears to be functionally identical to the previous.
@@ -539,10 +539,14 @@ module.exports = React.createClass({
//
// eventId is optional and will cause a switch to the context of that
// particular event.
// @param {Object} thirdPartyInvite Object containing data about the third party
// we received to join the room, if any.
// @param {Object} thirdPartyInvite.inviteSignUrl 3pid invite sign URL
Copy link
Member

Choose a reason for hiding this comment

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

s/Object/string/ here and below?

@richvdh
Copy link
Member

richvdh commented Mar 18, 2016

Hrm. It doesn't make RoomPreviewBar any less of a mess.

Looks ok other than the minor comments given though

@richvdh richvdh assigned dbkr and unassigned richvdh Mar 18, 2016
dbkr added a commit that referenced this pull request Mar 18, 2016
Display a warning if a third party invite for a room was sent to an address that is not bound publicly to our account
@dbkr dbkr merged commit 03de19c into develop Mar 18, 2016
@richvdh richvdh deleted the dbkr/show_invited_email branch February 15, 2017 13:16
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants