diff --git a/res/css/_components.scss b/res/css/_components.scss
index 3a6a3257a3..44c63b9df7 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -63,7 +63,6 @@
@import "./views/dialogs/_DeactivateAccountDialog.scss";
@import "./views/dialogs/_DeviceVerifyDialog.scss";
@import "./views/dialogs/_DevtoolsDialog.scss";
-@import "./views/dialogs/_EncryptedEventDialog.scss";
@import "./views/dialogs/_GroupAddressPicker.scss";
@import "./views/dialogs/_IncomingSasDialog.scss";
@import "./views/dialogs/_InviteDialog.scss";
diff --git a/res/css/views/dialogs/_EncryptedEventDialog.scss b/res/css/views/dialogs/_EncryptedEventDialog.scss
deleted file mode 100644
index ff73df509d..0000000000
--- a/res/css/views/dialogs/_EncryptedEventDialog.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_EncryptedEventDialog .mx_DeviceVerifyButtons {
- float: right;
- padding: 0px;
- margin-right: 42px;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
-}
-
-.mx_EncryptedEventDialog .mx_MemberDeviceInfo_textButton {
- @mixin mx_DialogButton;
- background-color: $primary-bg-color;
- color: $accent-color;
-}
-
-.mx_EncryptedEventDialog button {
- margin-top: 0px;
-}
diff --git a/src/async-components/views/dialogs/EncryptedEventDialog.js b/src/async-components/views/dialogs/EncryptedEventDialog.js
deleted file mode 100644
index 9eb4439816..0000000000
--- a/src/async-components/views/dialogs/EncryptedEventDialog.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from "react";
-import createReactClass from 'create-react-class';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {Key} from "../../../Keyboard";
-import * as sdk from "../../../index";
-
-// XXX: This component is not cross-signing aware.
-// https://github.com/vector-im/riot-web/issues/11752 tracks either updating this
-// component or taking it out to pasture.
-export default createReactClass({
- displayName: 'EncryptedEventDialog',
-
- propTypes: {
- event: PropTypes.object.isRequired,
- onFinished: PropTypes.func.isRequired,
- },
-
- getInitialState: function() {
- return { device: null };
- },
-
- componentDidMount: function() {
- this._unmounted = false;
- const client = MatrixClientPeg.get();
-
- // first try to load the device from our store.
- //
- this.refreshDevice().then((dev) => {
- if (dev) {
- return dev;
- }
-
- // tell the client to try to refresh the device list for this user
- return client.downloadKeys([this.props.event.getSender()], true).then(() => {
- return this.refreshDevice();
- });
- }).then((dev) => {
- if (this._unmounted) {
- return;
- }
-
- this.setState({ device: dev });
- client.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
- }, (err)=>{
- console.log("Error downloading devices", err);
- });
- },
-
- componentWillUnmount: function() {
- this._unmounted = true;
- const client = MatrixClientPeg.get();
- if (client) {
- client.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
- }
- },
-
- refreshDevice: function() {
- // Promise.resolve to handle transition from static result to promise; can be removed
- // in future
- return Promise.resolve(MatrixClientPeg.get().getEventSenderDeviceInfo(this.props.event));
- },
-
- onDeviceVerificationChanged: function(userId, device) {
- if (userId === this.props.event.getSender()) {
- this.refreshDevice().then((dev) => {
- this.setState({ device: dev });
- });
- }
- },
-
- onKeyDown: function(e) {
- if (e.key === Key.ESCAPE) {
- e.stopPropagation();
- e.preventDefault();
- this.props.onFinished(false);
- }
- },
-
- _renderDeviceInfo: function() {
- const device = this.state.device;
- if (!device) {
- return ({ _t('unknown device') });
- }
-
- let verificationStatus = ({ _t('NOT verified') });
- if (device.isBlocked()) {
- verificationStatus = ({ _t('Blacklisted') });
- } else if (device.isVerified()) {
- verificationStatus = _t('verified');
- }
-
- return (
-