Merge branch 'develop' into t3chguy/ts/4
This commit is contained in:
@@ -168,11 +168,11 @@ export class SetupEncryptionStore extends EventEmitter {
|
||||
this.phase = Phase.Done;
|
||||
this.emit("update");
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
public onVerificationRequest = (request: VerificationRequest): void => {
|
||||
this.setActiveVerificationRequest(request);
|
||||
}
|
||||
};
|
||||
|
||||
public onVerificationRequestChange = (): void => {
|
||||
if (this.verificationRequest.cancelled) {
|
||||
@@ -189,7 +189,7 @@ export class SetupEncryptionStore extends EventEmitter {
|
||||
this.phase = publicKeysTrusted ? Phase.Done : Phase.Busy;
|
||||
this.emit("update");
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
public skip(): void {
|
||||
this.phase = Phase.ConfirmSkip;
|
||||
|
||||
Reference in New Issue
Block a user