Merge branches 'develop' and 't3chguy/community_member_invite_IS_text' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/community_member_invite_IS_text

This commit is contained in:
Michael Telatynski 2019-09-12 12:53:32 +01:00
commit 6dc69afe67
38 changed files with 975 additions and 393 deletions

View file

@ -57,7 +57,7 @@ export function showStartChatInviteDialog() {
validAddressTypes: ['mx-user-id', 'email'],
button: _t("Start Chat"),
onFinished: _onStartDmFinished,
});
}, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
}
export function showRoomInviteDialog(roomId) {
@ -78,7 +78,7 @@ export function showRoomInviteDialog(roomId) {
onFinished: (shouldInvite, addrs) => {
_onRoomInviteFinished(roomId, shouldInvite, addrs);
},
});
}, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
}
/**