OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

don't dismiss toasts for device verification 

as they are immediately started
pull/21833/head
Bruno Windels 2020-01-29 15:22:05 +01:00
parent 64e96331ca
commit c4f1659116
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/toasts/VerificationRequestToast.js
View File

@ -56,7 +56,10 @@ export default class VerificationRequestToast extends React.PureComponent {
_checkRequestIsPending = () => {
const {request} = this.props;
if (request.ready || request.started || request.done || request.cancelled || request.observeOnly) {
const isPendingInRoomRequest = request.channel.roomId &&
!(request.ready || request.started || request.done || request.cancelled || request.observeOnly);
const isPendingDeviceRequest = request.channel.deviceId && request.started;
if (!isPendingInRoomRequest && !isPendingDeviceRequest) {
ToastStore.sharedInstance().dismissToast(this.props.toastKey);
}
};