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

Merge branch 'develop' into t3chguy/ts/4

Browse source
This commit is contained in:
Michael Telatynski 2021-06-29 22:24:47 +01:00 • committed by GitHub
commit 6250d9ba61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
693 changed files with 4996 additions and 5258 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/stores/SetupEncryptionStore.ts
View file

@ -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;