diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index 0f5f417dbc..d02319119e 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -94,10 +94,20 @@ export default class MKeyVerificationRequest extends React.Component {
_cancelledLabel(userId) {
const client = MatrixClientPeg.get();
const myUserId = client.getUserId();
+ const {cancellationCode} = this.props.mxEvent.verificationRequest;
+ const declined = cancellationCode === "m.user";
if (userId === myUserId) {
- return _t("You cancelled");
+ if (declined) {
+ return _t("You declined");
+ } else {
+ return _t("You cancelled");
+ }
} else {
- return _t("%(name)s cancelled", {name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId())});
+ if (declined) {
+ return _t("%(name)s declined", {name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId())});
+ } else {
+ return _t("%(name)s cancelled", {name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId())});
+ }
}
}
@@ -116,15 +126,19 @@ export default class MKeyVerificationRequest extends React.Component {
let subtitle;
let stateNode;
- const accepted = request.ready || request.started || request.done;
- if (accepted || request.cancelled) {
+ if (!request.canAccept) {
let stateLabel;
+ const accepted = request.ready || request.started || request.done;
if (accepted) {
stateLabel = (