incorporate "missing" and "declined" call statuses

This commit is contained in:
or-else
2022-06-09 11:29:33 -07:00
parent fd1c13830c
commit f884874d43
18 changed files with 201 additions and 245 deletions
+6 -5
View File
@@ -7,17 +7,18 @@ import { secondsToTime } from '../lib/strformat.js';
export default class CallMessage extends React.PureComponent {
render() {
const isCallDropped = this.props.callState == 'disconnected';
const isCallDropped = ['declined', 'disconnected', 'missed'].includes(this.props.callState);
const successClass = 'material-icons medium ' + (isCallDropped ? 'red' : 'green');
const callIcon = this.props.incoming ?
(isCallDropped ? 'call_missed' : 'call_received') :
(isCallDropped ? 'call_missed_outgoing' : 'call_made');
const duration = isCallDropped ? (
this.props.incoming ?
<FormattedMessage id="call_missed" defaultMessage="missed" description="Label for cancelled incoming call" /> :
this.props.incoming ? (this.props.callState == 'declined' ?
<FormattedMessage id="call_declined" defaultMessage="declined" description="Label for declined incoming call" /> :
<FormattedMessage id="call_missed" defaultMessage="missed" description="Label for missed incoming call" />
) :
<FormattedMessage id="call_cancelled" defaultMessage="cancelled" description="Label for cancelled outgoing call" />
) :
<span>{secondsToTime(this.props.duration / 1000)}</span>;
) : <span>{secondsToTime(this.props.duration / 1000)}</span>;
return <div className="call-message">
<div><i className="material-icons big gray">call</i></div>
<div className="flex-column narrow">
+6 -5
View File
@@ -9,16 +9,17 @@ import { secondsToTime } from '../lib/strformat.js';
// success: true | false.
export default class CallStatus extends React.PureComponent {
render() {
const isCallDropped = this.props.callState == 'disconnected';
const isCallDropped = ['declined', 'disconnected', 'missed'].includes(this.props.callState);
const icon2 = this.props.incoming ?
(isCallDropped ? 'call_missed' : 'call_received') :
(isCallDropped ? 'call_missed_outgoing' : 'call_made');
const duration = isCallDropped ? (
this.props.incoming ?
<FormattedMessage id="call_missed" defaultMessage="missed" description="Label for cancelled incoming call" /> :
<FormattedMessage id="call_cancelled" defaultMessage="cancelled" description="Label for cancelled outgoing call" />
this.props.incoming ? (this.props.callState == 'declined' ?
<FormattedMessage id="call_declined" defaultMessage="declined" description="Label for declined incoming call" /> :
<FormattedMessage id="call_missed" defaultMessage="missed" description="Label for missed incoming call" />
) :
<span>{secondsToTime(this.props.duration / 1000)}</span>;
<FormattedMessage id="call_cancelled" defaultMessage="cancelled" description="Label for cancelled outgoing call" />
) : <span>{secondsToTime(this.props.duration / 1000)}</span>;
return (
<>
<div className="composed-material">