Merge pull request #4198 from matrix-org/bwindels/dontenable4swhenacceptingverifreq

Revert "enable 4s when accepting a verification request"
This commit is contained in:
Bruno Windels 2020-03-11 11:30:15 +00:00 committed by GitHub
commit 138e663498
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 5 deletions

View file

@ -24,7 +24,6 @@ import {userLabelForEventRoom} from "../../../utils/KeyVerificationStateObserver
import dis from "../../../dispatcher";
import ToastStore from "../../../stores/ToastStore";
import Modal from "../../../Modal";
import {enable4SIfNeeded} from "../../../verification";
export default class VerificationRequestToast extends React.PureComponent {
constructor(props) {
@ -74,9 +73,6 @@ export default class VerificationRequestToast extends React.PureComponent {
}
accept = async () => {
if (!await enable4SIfNeeded()) {
return;
}
ToastStore.sharedInstance().dismissToast(this.props.toastKey);
const {request} = this.props;
// no room id for to_device requests