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

fixes!

Browse source
This commit is contained in:
Bruno Windels 2020-01-03 13:40:20 +01:00
parent 3b9c5c0a27
commit 7a88a94936
5 changed files with 53 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/components/views/toasts/VerificationRequestToast.js
View file

@ -26,25 +26,16 @@ import dis from "../../../dispatcher";
export default class VerificationRequestToast extends React.PureComponent {
constructor(props) {
super(props);
const {event, timeout} = props.request;
// to_device requests don't have a timestamp, so consider them age=0
const age = event.getTs() ? event.getLocalAge() : 0;
const remaining = Math.max(0, timeout - age);
const counter = Math.ceil(remaining / 1000);
this.state = {counter};
this.state = {counter: Math.ceil(props.request.timeout / 1000)};
}
componentDidMount() {
const {request} = this.props;
this._intervalHandle = setInterval(() => {
let {counter} = this.state;
counter -= 1;
if (counter <= 0) {
this.cancel();
} else {
this.setState({counter});
}
counter = Math.max(0, counter - 1);
this.setState({counter});
}, 1000);
const {request} = this.props;
request.on("change", this._checkRequestIsPending);
}
@ -56,7 +47,7 @@ export default class VerificationRequestToast extends React.PureComponent {
_checkRequestIsPending = () => {
const {request} = this.props;
if (request.ready || request.started || request.done || request.cancelled) {
if (request.ready || request.started || request.done || request.cancelled || request.observeOnly) {
this.props.dismiss();
}
};