pro/im_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge devel

Browse Source
This commit is contained in:
or-else
2023-02-08 13:40:09 -08:00
parent fbdd017d38 7bc50fac36
commit 133ed3cc53
51 changed files with 144 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/call-message.jsx
+4 -1
View File
@@ -7,7 +7,7 @@ import { secondsToTime } from '../lib/strformat.js';
export default class CallMessage extends React.PureComponent {
render() {
const isCallDropped = ['declined', 'disconnected', 'missed'].includes(this.props.callState);
const isCallDropped = ['busy', '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') :
@@ -15,6 +15,9 @@ export default class CallMessage extends React.PureComponent {
let duration;
if (isCallDropped) {
switch (this.props.callState) {
case 'busy':
duration = <FormattedMessage id="call_busy" defaultMessage="busy" description="Label for busy call line" />;
break;
case 'declined':
duration = <FormattedMessage id="call_declined" defaultMessage="declined" description="Label for declined call" />;
break;
src/widgets/call-status.jsx
+4 -1
View File
@@ -9,13 +9,16 @@ import { secondsToTime } from '../lib/strformat.js';
// success: true | false.
export default class CallStatus extends React.PureComponent {
render() {
const isCallDropped = ['declined', 'disconnected', 'missed'].includes(this.props.callState);
const isCallDropped = ['busy', 'declined', 'disconnected', 'missed'].includes(this.props.callState);
const icon2 = this.props.incoming ?
(isCallDropped ? 'call_missed' : 'call_received') :
(isCallDropped ? 'call_missed_outgoing' : 'call_made');
let duration;
if (isCallDropped) {
switch (this.props.callState) {
case 'busy':
duration = <FormattedMessage id="call_busy" defaultMessage="busy" description="Label for busy call line" />;
break;
case 'declined':
duration = <FormattedMessage id="call_declined" defaultMessage="declined" description="Label for declined call" />;
break;
src/widgets/credential-edit.jsx
+1 -1
View File
@@ -84,7 +84,7 @@ class CredentialEdit extends React.PureComponent {
const changePhone = (
<><div className="panel-form-row">
<label className="large"><FormattedMessage id="change_phonel" defaultMessage="Change phone number"
<label className="large"><FormattedMessage id="change_phone" defaultMessage="Change phone number"
description="Prompt to change current phone number"/></label>
</div>
<div className="group">