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

Conform more of the codebase to strictNullChecks (#10504

Browse source 
* Conform more of the codebase to `strictNullChecks`

* Iterate
This commit is contained in:
Michael Telatynski 2023-04-04 11:41:46 +01:00 • committed by GitHub
parent 6db0c7a1a6
commit bc60a9b594
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 60 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/components/views/dialogs/IncomingSasDialog.tsx
View file

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from "react";
import React, { ReactNode } from "react";
import { IGeneratedSas, ISasEvent, SasEvent } from "matrix-js-sdk/src/crypto/verification/SAS";
import { VerificationBase, VerificationEvent } from "matrix-js-sdk/src/crypto/verification/Base";
import { logger } from "matrix-js-sdk/src/logger";
@ -48,13 +48,13 @@ interface IState {
// eslint-disable-next-line camelcase
avatar_url?: string;
displayname?: string;
};
opponentProfileError: Error;
sas: IGeneratedSas;
} | null;
opponentProfileError: Error | null;
sas: IGeneratedSas | null;
}
export default class IncomingSasDialog extends React.Component<IProps, IState> {
private showSasEvent: ISasEvent;
private showSasEvent: ISasEvent | null;
public constructor(props: IProps) {
super(props);
@ -93,7 +93,7 @@ export default class IncomingSasDialog extends React.Component<IProps, IState> {
});
} catch (e) {
this.setState({
opponentProfileError: e,
opponentProfileError: e as Error,
});
}
}
@ -133,7 +133,7 @@ export default class IncomingSasDialog extends React.Component<IProps, IState> {
};
private onSasMatchesClick = (): void => {
this.showSasEvent.confirm();
this.showSasEvent?.confirm();
this.setState({
phase: PHASE_WAIT_FOR_PARTNER_TO_CONFIRM,
});
@ -143,7 +143,7 @@ export default class IncomingSasDialog extends React.Component<IProps, IState> {
this.props.onFinished(true);
};
private renderPhaseStart(): JSX.Element {
private renderPhaseStart(): ReactNode {
const isSelf = this.props.verifier.userId === MatrixClientPeg.get().getUserId();
let profile;
@ -227,7 +227,8 @@ export default class IncomingSasDialog extends React.Component<IProps, IState> {
);
}
private renderPhaseShowSas(): JSX.Element {
private renderPhaseShowSas(): ReactNode {
if (!this.showSasEvent) return null;
return (
<VerificationShowSas
sas={this.showSasEvent.sas}
@ -239,7 +240,7 @@ export default class IncomingSasDialog extends React.Component<IProps, IState> {
);
}
private renderPhaseWaitForPartnerToConfirm(): JSX.Element {
private renderPhaseWaitForPartnerToConfirm(): ReactNode {
return (
<div>
<Spinner />
@ -248,15 +249,15 @@ export default class IncomingSasDialog extends React.Component<IProps, IState> {
);
}
private renderPhaseVerified(): JSX.Element {
private renderPhaseVerified(): ReactNode {
return <VerificationComplete onDone={this.onVerifiedDoneClick} />;
}
private renderPhaseCancelled(): JSX.Element {
private renderPhaseCancelled(): ReactNode {
return <VerificationCancelled onDone={this.onCancelClick} />;
}
public render(): React.ReactNode {
public render(): ReactNode {
let body;
switch (this.state.phase) {
case PHASE_START: