From fb5c18caa0e9bb0c700e1bf95da17b054e2da079 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Fri, 24 Sep 2021 20:04:03 +0200
Subject: [PATCH] Convert MKeyVerificationConclusion to TS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
...sion.js => MKeyVerificationConclusion.tsx} | 47 ++++++++++---------
src/components/views/rooms/EventTile.tsx | 4 +-
2 files changed, 26 insertions(+), 25 deletions(-)
rename src/components/views/messages/{MKeyVerificationConclusion.js => MKeyVerificationConclusion.tsx} (74%)
diff --git a/src/components/views/messages/MKeyVerificationConclusion.js b/src/components/views/messages/MKeyVerificationConclusion.tsx
similarity index 74%
rename from src/components/views/messages/MKeyVerificationConclusion.js
rename to src/components/views/messages/MKeyVerificationConclusion.tsx
index a5f12df47d..3e2ae9fa9b 100644
--- a/src/components/views/messages/MKeyVerificationConclusion.js
+++ b/src/components/views/messages/MKeyVerificationConclusion.tsx
@@ -16,44 +16,50 @@ limitations under the License.
import React from 'react';
import classNames from 'classnames';
-import PropTypes from 'prop-types';
import { MatrixClientPeg } from '../../../MatrixClientPeg';
import { _t } from '../../../languageHandler';
-import { getNameForEventRoom, userLabelForEventRoom }
- from '../../../utils/KeyVerificationStateObserver';
+import { getNameForEventRoom, userLabelForEventRoom } from '../../../utils/KeyVerificationStateObserver';
import EventTileBubble from "./EventTileBubble";
import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+
+interface IProps {
+ /* the MatrixEvent to show */
+ mxEvent: MatrixEvent;
+}
@replaceableComponent("views.messages.MKeyVerificationConclusion")
-export default class MKeyVerificationConclusion extends React.Component {
- constructor(props) {
+export default class MKeyVerificationConclusion extends React.Component<IProps> {
+ constructor(props: IProps) {
super(props);
}
- componentDidMount() {
+ public componentDidMount(): void {
const request = this.props.mxEvent.verificationRequest;
if (request) {
- request.on("change", this._onRequestChanged);
+ request.on("change", this.onRequestChanged);
}
- MatrixClientPeg.get().on("userTrustStatusChanged", this._onTrustChanged);
+ MatrixClientPeg.get().on("userTrustStatusChanged", this.onTrustChanged);
}
- componentWillUnmount() {
+ public componentWillUnmount(): void {
const request = this.props.mxEvent.verificationRequest;
if (request) {
- request.off("change", this._onRequestChanged);
+ request.off("change", this.onRequestChanged);
}
const cli = MatrixClientPeg.get();
if (cli) {
- cli.removeListener("userTrustStatusChanged", this._onTrustChanged);
+ cli.removeListener("userTrustStatusChanged", this.onTrustChanged);
}
}
- _onRequestChanged = () => {
+ private onRequestChanged = () => {
this.forceUpdate();
};
- _onTrustChanged = (userId, status) => {
+ private onTrustChanged = (userId: string): void => {
const { mxEvent } = this.props;
const request = mxEvent.verificationRequest;
if (!request || request.otherUserId !== userId) {
@@ -62,17 +68,17 @@ export default class MKeyVerificationConclusion extends React.Component {
this.forceUpdate();
};
- _shouldRender(mxEvent, request) {
+ public static shouldRender(mxEvent: MatrixEvent, request: VerificationRequest): boolean {
// normally should not happen
if (!request) {
return false;
}
// .cancel event that was sent after the verification finished, ignore
- if (mxEvent.getType() === "m.key.verification.cancel" && !request.cancelled) {
+ if (mxEvent.getType() === EventType.KeyVerificationCancel && !request.cancelled) {
return false;
}
// .done event that was sent after the verification cancelled, ignore
- if (mxEvent.getType() === "m.key.verification.done" && !request.done) {
+ if (mxEvent.getType() === EventType.KeyVerificationDone && !request.done) {
return false;
}
@@ -89,11 +95,11 @@ export default class MKeyVerificationConclusion extends React.Component {
return true;
}
- render() {
+ public render(): JSX.Element {
const { mxEvent } = this.props;
const request = mxEvent.verificationRequest;
- if (!this._shouldRender(mxEvent, request)) {
+ if (!MKeyVerificationConclusion.shouldRender(mxEvent, request)) {
return null;
}
@@ -129,8 +135,3 @@ export default class MKeyVerificationConclusion extends React.Component {
return null;
}
}
-
-MKeyVerificationConclusion.propTypes = {
- /* the MatrixEvent to show */
- mxEvent: PropTypes.object.isRequired,
-};
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
index e1f0eb5368..d1ac06b199 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -58,6 +58,7 @@ import ReactionsRow from '../messages/ReactionsRow';
import { getEventDisplayInfo } from '../../../utils/EventUtils';
import { RightPanelPhases } from "../../../stores/RightPanelStorePhases";
import SettingsStore from "../../../settings/SettingsStore";
+import MKeyVerificationConclusion from "../messages/MKeyVerificationConclusion";
const eventTileTypes = {
[EventType.RoomMessage]: 'messages.MessageEvent',
@@ -144,8 +145,7 @@ export function getHandlerTile(ev) {
// XXX: This is extremely a hack. Possibly these components should have an interface for
// declining to render?
if (type === "m.key.verification.cancel" || type === "m.key.verification.done") {
- const MKeyVerificationConclusion = sdk.getComponent("messages.MKeyVerificationConclusion");
- if (!MKeyVerificationConclusion.prototype._shouldRender.call(null, ev, ev.request)) {
+ if (!MKeyVerificationConclusion.shouldRender(ev, ev.request)) {
return;
}
}