Merge pull request #12768 from mariogasparoni/merge-2.3.x-into-develop

chore: merge 2.3.6+ into develop

bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx

@@ -285,13 +285,14 @@ class AudioModal extends Component {
   handleJoinListenOnly() {
     const {
       joinListenOnly,
+      isConnecting,
     } = this.props;
 
     const {
       disableActions,
     } = this.state;
 
-    if (disableActions) return;
+    if (disableActions && isConnecting) return;
 
     this.setState({
       disableActions: true,
@@ -313,13 +314,14 @@ class AudioModal extends Component {
   handleJoinMicrophone() {
     const {
       joinMicrophone,
+      isConnecting,
     } = this.props;
 
     const {
       disableActions,
     } = this.state;
 
-    if (disableActions) return;
+    if (disableActions && isConnecting) return;
 
     this.setState({
       hasError: false,

bigbluebutton-html5/imports/ui/services/audio-manager/index.js

@@ -372,8 +372,12 @@ class AudioManager {
 
     if (!this.logAudioJoinTime) {
       this.logAudioJoinTime = true;
-      logger.info({ logCode: 'audio_mic_join_time' }, 'Time needed to '
-      + `connect audio (seconds): ${secondsToActivateAudio}`);
+      logger.info({
+        logCode: 'audio_mic_join_time',
+        extraInfo: {
+          secondsToActivateAudio,
+        },
+      }, `Time needed to connect audio (seconds): ${secondsToActivateAudio}`);
     }
 
     if (!this.isEchoTest) {