|
|
@@ -1,5 +1,7 @@
|
|
1
|
1
|
// @flow
|
|
2
|
2
|
|
|
|
3
|
+import _ from 'lodash';
|
|
|
4
|
+
|
|
3
|
5
|
import { JitsiTrackErrors } from '../lib-jitsi-meet';
|
|
4
|
6
|
import {
|
|
5
|
7
|
getLocalParticipant,
|
|
|
@@ -155,10 +157,10 @@ export function forEachConference(
|
|
155
|
157
|
export function getConferenceName(stateful: Function | Object): string {
|
|
156
|
158
|
const state = toState(stateful);
|
|
157
|
159
|
const { callee } = state['features/base/jwt'];
|
|
|
160
|
+ const { callDisplayName } = state['features/base/config'];
|
|
|
161
|
+ const { pendingSubjectChange, room, subject } = state['features/base/conference'];
|
|
158
|
162
|
|
|
159
|
|
- return state['features/base/config'].callDisplayName
|
|
160
|
|
- || (callee && callee.name)
|
|
161
|
|
- || state['features/base/conference'].room;
|
|
|
163
|
+ return pendingSubjectChange || subject || callDisplayName || (callee && callee.name) || _.startCase(room);
|
|
162
|
164
|
}
|
|
163
|
165
|
|
|
164
|
166
|
/**
|