From 06b0d5b23eac3e7db8b29e9124f3b41452a1967e Mon Sep 17 00:00:00 2001
From: Mario Jr <mariogasparoni@gmail.com>
Date: Mon, 17 May 2021 16:37:46 -0300
Subject: [PATCH 1/3] fix(audio): audio modal inactive after connection error

Closes #12018
---
 .../imports/ui/components/audio/audio-modal/component.jsx   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
index 0f336dcd6f..96aede47ca 100755
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
@@ -286,13 +286,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,
@@ -314,13 +315,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,

From 9fe8a68e9854b3124cbbcc5938a7cead86dc9ad6 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Mon, 5 Jul 2021 23:42:45 +0900
Subject: [PATCH 2/3] Update styles.scss

---
 .../imports/ui/components/polling/styles.scss             | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/polling/styles.scss b/bigbluebutton-html5/imports/ui/components/polling/styles.scss
index e9909b14c4..4eeef31da5 100644
--- a/bigbluebutton-html5/imports/ui/components/polling/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/polling/styles.scss
@@ -90,14 +90,6 @@
   display: grid;
   grid-template-columns: repeat(var(--col-amount), 1fr);
 
-  > .pollButtonWrapper:nth-child(odd) {
-      grid-column: 1;
-  }
-
-  > .pollButtonWrapper:nth-child(even) {
-      grid-column: var(--col-amount);
-  }
-
   @include mq($hasPhoneDimentions) {
     grid-template-columns: repeat(1, 1fr);
 

From 4e1eb7318d09925f7cb331e3f62e34439e2e919f Mon Sep 17 00:00:00 2001
From: Mario Jr <mariogasparoni@gmail.com>
Date: Fri, 9 Jul 2021 13:43:43 -0300
Subject: [PATCH 3/3] chore(audio): add audio join time in extraInfo of server
 log

---
 .../imports/ui/services/audio-manager/index.js            | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
index 972cefcc6a..e17b045db9 100755
--- a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
+++ b/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) {