imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #772 from matrix-org/dbkr/disinvite_is_not_kick

Browse source 
Correct confirm prompt for disinvite
This commit is contained in:
David Baker 2017-03-27 17:42:39 +01:00 • committed by GitHub
commit a38a954fb5
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/rooms/MemberInfo.js
View file

@ -218,11 +218,13 @@ module.exports = WithMatrixClient(React.createClass({
}, },
onKick: function() { onKick: function() {
const membership = this.props.member.membership;
const kickLabel = membership === "invite" ? "Disinvite" : "Kick";
const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog"); const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
Modal.createDialog(ConfirmUserActionDialog, { Modal.createDialog(ConfirmUserActionDialog, {
member: this.props.member, member: this.props.member,
action: 'Kick', action: kickLabel,
askReason: true, askReason: membership == "join",
danger: true, danger: true,
onFinished: (proceed, reason) => { onFinished: (proceed, reason) => {
if (!proceed) return; if (!proceed) return;