merge devel

This commit is contained in:
or-else
2023-02-08 13:40:09 -08:00
51 changed files with 144 additions and 53 deletions
+21 -3
View File
@@ -3579,7 +3579,7 @@ __webpack_require__.r(__webpack_exports__);
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
/* harmony export */ "PACKAGE_VERSION": () => (/* binding */ PACKAGE_VERSION)
/* harmony export */ });
const PACKAGE_VERSION = "0.21.0";
const PACKAGE_VERSION = "0.21.1";
/***/ }),
@@ -10179,12 +10179,21 @@ __webpack_require__.r(__webpack_exports__);
class CallMessage extends (react__WEBPACK_IMPORTED_MODULE_0___default().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' : isCallDropped ? 'call_missed_outgoing' : 'call_made';
let duration;
if (isCallDropped) {
switch (this.props.callState) {
case 'busy':
duration = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
id: "call_busy",
defaultMessage: [{
"type": 0,
"value": "busy"
}]
});
break;
case 'declined':
duration = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
id: "call_declined",
@@ -10866,11 +10875,20 @@ __webpack_require__.r(__webpack_exports__);
class CallStatus extends (react__WEBPACK_IMPORTED_MODULE_0___default().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 = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
id: "call_busy",
defaultMessage: [{
"type": 0,
"value": "busy"
}]
});
break;
case 'declined':
duration = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
id: "call_declined",