imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Conform src/components/views/messages/* code to strictNullChecks (#10461)

Browse source
This commit is contained in:
Michael Telatynski 2023-03-29 08:22:35 +01:00 • committed by GitHub
parent 7cb90d0f78
commit cefd94859c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 109 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/components/views/messages/MKeyVerificationRequest.tsx
View file

@ -15,7 +15,7 @@ limitations under the License.
*/
import React from "react";
import { MatrixEvent } from "matrix-js-sdk/src/matrix";
import { MatrixEvent, User } from "matrix-js-sdk/src/matrix";
import { logger } from "matrix-js-sdk/src/logger";
import { VerificationRequestEvent } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
@ -48,8 +48,11 @@ export default class MKeyVerificationRequest extends React.Component<IProps> {
}
private openRequest = (): void => {
let member: User | undefined;
const { verificationRequest } = this.props.mxEvent;
const member = MatrixClientPeg.get().getUser(verificationRequest.otherUserId);
if (verificationRequest) {
member = MatrixClientPeg.get().getUser(verificationRequest.otherUserId) ?? undefined;
}
RightPanelStore.instance.setCards([
{ phase: RightPanelPhases.RoomSummary },
{ phase: RightPanelPhases.RoomMemberInfo, state: { member } },
@ -90,14 +93,14 @@ export default class MKeyVerificationRequest extends React.Component<IProps> {
if (userId === myUserId) {
return _t("You accepted");
} else {
return _t("%(name)s accepted", { name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId()) });
return _t("%(name)s accepted", { name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId()!) });
}
}
private cancelledLabel(userId: string): string {
const client = MatrixClientPeg.get();
const myUserId = client.getUserId();
const { cancellationCode } = this.props.mxEvent.verificationRequest;
const cancellationCode = this.props.mxEvent.verificationRequest?.cancellationCode;
const declined = cancellationCode === "m.user";
if (userId === myUserId) {
if (declined) {
@ -107,9 +110,9 @@ export default class MKeyVerificationRequest extends React.Component<IProps> {
}
} else {
if (declined) {
return _t("%(name)s declined", { name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId()) });
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()) });
return _t("%(name)s cancelled", { name: getNameForEventRoom(userId, this.props.mxEvent.getRoomId()!) });
}
}
}
@ -136,7 +139,7 @@ export default class MKeyVerificationRequest extends React.Component<IProps> {
</AccessibleButton>
);
} else if (request.cancelled) {
stateLabel = this.cancelledLabel(request.cancellingUserId);
stateLabel = this.cancelledLabel(request.cancellingUserId!);
} else if (request.accepting) {
stateLabel = _t("Accepting…");
} else if (request.declining) {
@ -146,9 +149,9 @@ export default class MKeyVerificationRequest extends React.Component<IProps> {
}
if (!request.initiatedByMe) {
const name = getNameForEventRoom(request.requestingUserId, mxEvent.getRoomId());
const name = getNameForEventRoom(request.requestingUserId, mxEvent.getRoomId()!);
title = _t("%(name)s wants to verify", { name });
subtitle = userLabelForEventRoom(request.requestingUserId, mxEvent.getRoomId());
subtitle = userLabelForEventRoom(request.requestingUserId, mxEvent.getRoomId()!);
if (request.canAccept) {
stateNode = (
<div className="mx_cryptoEvent_buttons">
@ -164,7 +167,7 @@ export default class MKeyVerificationRequest extends React.Component<IProps> {
} else {
// request sent by us
title = _t("You sent a verification request");
subtitle = userLabelForEventRoom(request.receivingUserId, mxEvent.getRoomId());
subtitle = userLabelForEventRoom(request.receivingUserId, mxEvent.getRoomId()!);
}
if (title) {