Merge pull request #6317 from antobinary/timeouts

Change icon for clearing annotations in whiteboard

bigbluebutton-html5/imports/ui/components/join-handler/component.jsx

@@ -71,7 +71,11 @@ class JoinHandler extends Component {
       return resp;
     };
 
-    const setLogoutURL = (url) => Auth.logoutURL = url;
+    const setLogoutURL = (url) => {
+      Auth.logoutURL = url;
+      return true;
+    };
+
     const setLogoURL = (resp) => {
       setCustomLogoUrl(resp.customLogoURL);
       return resp;
@@ -97,10 +101,10 @@ class JoinHandler extends Component {
         .then((resp) => {
           setLogoutURL(resp.logoutURL);
           if (resp.returncode !== 'FAILED') {
-            logger.info(`User successfully went through main.joinRouteHandler with [${resp}].`);
+            logger.info(`User successfully went through main.joinRouteHandler with [${JSON.stringify(resp)}].`);
             return resolve(resp);
           }
-          const e = new Error('Session not found');          
+          const e = new Error('Session not found');
           logger.error(`User faced [${e}] on main.joinRouteHandler. Error was:`, JSON.stringify(resp));
           return reject(e);
         });

bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx

@@ -562,7 +562,7 @@ class WhiteboardToolbar extends Component {
     return (
       <ToolbarMenuItem
         label={intl.formatMessage(intlMessages.toolbarClearAnnotations)}
-        icon="circle_close"
+        icon="delete"
         onItemClick={this.handleClearAll}
         className={cx(styles.toolbarButton, styles.notActive)}
       />