Merge pull request #13154 from mariogasparoni/fix-13153

fix(audio): screen goes blank when using listen only in ios

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

@@ -187,7 +187,7 @@ class AudioModal extends Component {
 
     if (autoplayBlocked !== prevProps.autoplayBlocked) {
       if (autoplayBlocked) {
-        this.setContent('autoplayBlocked');
+        this.setContent({ content: 'autoplayBlocked' });
       } else {
         closeModal();
       }

bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx

@@ -43,13 +43,17 @@ const intlMessages = defineMessages({
     id: 'app.createBreakoutRoom.returnAudio',
     description: 'label for option to return audio',
   },
+  generateURL: {
+    id: 'app.createBreakoutRoom.generateURL',
+    description: 'label for generate breakout room url',
+  },
   generatingURL: {
     id: 'app.createBreakoutRoom.generatingURL',
     description: 'label for generating breakout room url',
   },
   generatedURL: {
     id: 'app.createBreakoutRoom.generatedURL',
-    description: 'label for generate breakout room url',
+    description: 'label for generated breakout room url',
   },
   endAllBreakouts: {
     id: 'app.createBreakoutRoom.endAllBreakouts',
@@ -94,6 +98,7 @@ class BreakoutRoom extends PureComponent {
     super(props);
     this.renderBreakoutRooms = this.renderBreakoutRooms.bind(this);
     this.getBreakoutURL = this.getBreakoutURL.bind(this);
+    this.getBreakoutLabel = this.getBreakoutLabel.bind(this);
     this.renderDuration = this.renderDuration.bind(this);
     this.transferUserToBreakoutRoom = this.transferUserToBreakoutRoom.bind(this);
     this.changeExtendTime = this.changeExtendTime.bind(this);
@@ -175,6 +180,23 @@ class BreakoutRoom extends PureComponent {
     return null;
   }
 
+  getBreakoutLabel(breakoutId) {
+    const { intl, breakoutRoomUser } = this.props;
+    const { requestedBreakoutId, generated } = this.state;
+
+    const hasUser = breakoutRoomUser(breakoutId);
+
+    if (generated && requestedBreakoutId === breakoutId) {
+      return intl.formatMessage(intlMessages.generatedURL);
+    }
+
+    if (hasUser) {
+      return intl.formatMessage(intlMessages.breakoutJoin);
+    }
+
+    return intl.formatMessage(intlMessages.generateURL);
+  }
+
   clearJoinedAudioOnly() {
     this.setState({ joinedAudioOnly: false });
   }
@@ -285,11 +307,7 @@ class BreakoutRoom extends PureComponent {
             )
             : (
               <Button
-                label={
-                  generated && requestedBreakoutId === breakoutId
-                    ? intl.formatMessage(intlMessages.generatedURL)
-                    : intl.formatMessage(intlMessages.breakoutJoin)
-                }
+                label={this.getBreakoutLabel(breakoutId)}
                 data-test="breakoutJoin"
                 aria-label={`${intl.formatMessage(intlMessages.breakoutJoin)} ${number}`}
                 onClick={() => {

bigbluebutton-html5/imports/ui/components/end-meeting-confirmation/component.jsx

@@ -77,7 +77,7 @@ class EndMeetingComponent extends PureComponent {
           <div className={styles.footer}>
             <Button
               data-test="confirmEndMeeting"
-              color="primary"
+              color="danger"
               className={styles.button}
               label={intl.formatMessage(intlMessages.yesLabel)}
               onClick={endMeeting}

bigbluebutton-html5/public/locales/en.json

@@ -807,6 +807,7 @@
     "app.createBreakoutRoom.title": "Breakout Rooms",
     "app.createBreakoutRoom.ariaTitle": "Hide Breakout Rooms",
     "app.createBreakoutRoom.breakoutRoomLabel": "Breakout Rooms {0}",
+    "app.createBreakoutRoom.generateURL": "Generate URL",
     "app.createBreakoutRoom.generatingURL": "Generating URL",
     "app.createBreakoutRoom.generatingURLMessage": "We are generating a join URL for the selected breakout room. It may take a few seconds...",
     "app.createBreakoutRoom.generatedURL": "Generated",