|
@@ -2,6 +2,7 @@
|
2
|
2
|
|
3
|
3
|
import React, { Component } from 'react';
|
4
|
4
|
|
|
5
|
+import { getConferenceName } from '../../../base/conference/functions';
|
5
|
6
|
import { connect } from '../../../base/redux';
|
6
|
7
|
import { isToolboxVisible } from '../../../toolbox';
|
7
|
8
|
|
|
@@ -13,7 +14,8 @@ import ParticipantsCount from './ParticipantsCount';
|
13
|
14
|
type Props = {
|
14
|
15
|
|
15
|
16
|
/**
|
16
|
|
- * The subject of the conference.
|
|
17
|
+ * The subject or the of the conference.
|
|
18
|
+ * Falls back to conference name.
|
17
|
19
|
*/
|
18
|
20
|
_subject: string,
|
19
|
21
|
|
|
@@ -60,10 +62,9 @@ class Subject extends Component<Props> {
|
60
|
62
|
* }}
|
61
|
63
|
*/
|
62
|
64
|
function _mapStateToProps(state) {
|
63
|
|
- const { subject } = state['features/base/conference'];
|
64
|
65
|
|
65
|
66
|
return {
|
66
|
|
- _subject: subject,
|
|
67
|
+ _subject: getConferenceName(state),
|
67
|
68
|
_visible: isToolboxVisible(state)
|
68
|
69
|
};
|
69
|
70
|
}
|