diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/component.jsx index 00ada29c7e99d83e6a20ed665ac431935b33e87f..c64971b3b8a7f03836821f19160ba9a9cc5e607d 100755 --- a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/component.jsx @@ -207,12 +207,6 @@ class AudioControls extends PureComponent { return ( <span className={styles.container}> - {isVoiceUser && inputStream && muteAlertEnabled && !listenOnly && muted ? ( - <MutedAlert {...{ - muted, inputStream, isViewer, isPresenter, - }} - /> - ) : null} {(showMute && isVoiceUser ) && ! translatorChannelOpen ? toggleMuteBtn : null} { this.renderJoinLeaveButton() diff --git a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js index 8bf565272f8c25d12b3148eabc4b6688dfd2ed18..fe139d2301c44f927aac5ccb00a947ba476ab31b 100755 --- a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js +++ b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js @@ -857,6 +857,7 @@ class AudioManager { } async openTranslatorChannel(languageExtension, onConnected) { + if( this.translatorBridge.activeSession ) { this.translatorChannelOpen = false; this.translatorBridge.exitAudio(); diff --git a/bigbluebutton-html5/package-lock.json b/bigbluebutton-html5/package-lock.json index f93cb745fa29c659afe7d5e44ab7c5dcaafd5de1..bed124aebd4340fb24d8112b6ea1434fab579370 100644 --- a/bigbluebutton-html5/package-lock.json +++ b/bigbluebutton-html5/package-lock.json @@ -8004,6 +8004,15 @@ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, + "rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, "string-width": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", @@ -8033,6 +8042,12 @@ "has-flag": "^4.0.0" } }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -10815,12 +10830,11 @@ "dev": true }, "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.1.0.tgz", + "integrity": "sha512-gCFO5iHIbRPwznl6hAYuwNFld8W4S2shtSJIqG27ReWXo9IWrCyEICxUA+6vJHwSR/OakoenC4QsDxq50tzYmw==", "requires": { - "tslib": "^1.9.0" + "tslib": "~2.1.0" } }, "safe-buffer": { @@ -12187,10 +12201,9 @@ } }, "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" }, "tunnel-agent": { "version": "0.6.0", diff --git a/bigbluebutton-html5/package.json b/bigbluebutton-html5/package.json index 46a606fcd9ff5903c10a4ac4d5a9a4d63839f12c..57aaf73fdc48b9cf6101450fa657a4a7ed44a005 100755 --- a/bigbluebutton-html5/package.json +++ b/bigbluebutton-html5/package.json @@ -70,6 +70,7 @@ "react-virtualized": "^9.22.3", "reconnecting-websocket": "~v4.1.10", "redis": "^3.1.2", + "rxjs": "^7.1.0", "sanitize-html": "2.3.3", "sdp-transform": "2.7.0", "string-hash": "~1.1.3",