haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: welcome page logo not being displayed

This commit is contained in:
Vlad Piersec 2020-06-23 10:26:52 +03:00 committed by Saúl Ibarra Corretgé
parent 22d040ab76
commit 047c9b43ea
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
react/features/base/react/components/web/Watermarks.js
View File

@ -42,6 +42,11 @@ type Props = {
*/ */
_readyToDisplayJitsiWatermark: boolean, _readyToDisplayJitsiWatermark: boolean,
/**
* Returns true if welcome page is visible at the moment.
*/
_welcomePageIsVisible: boolean,
/** /**
* Invoked to obtain translated strings. * Invoked to obtain translated strings.
*/ */
@ -162,11 +167,13 @@ class Watermarks extends Component<Props, State> {
} = this.state; } = this.state;
const { const {
_isGuest, _isGuest,
_readyToDisplayJitsiWatermark _readyToDisplayJitsiWatermark,
_welcomePageIsVisible
} = this.props; } = this.props;
return _readyToDisplayJitsiWatermark return (_readyToDisplayJitsiWatermark
&& (showJitsiWatermark || (_isGuest && showJitsiWatermarkForGuests)); && (showJitsiWatermark || (_isGuest && showJitsiWatermarkForGuests)))
|| _welcomePageIsVisible;
} }
/** /**
@ -273,6 +280,7 @@ class Watermarks extends Component<Props, State> {
function _mapStateToProps(state) { function _mapStateToProps(state) {
const { isGuest } = state['features/base/jwt']; const { isGuest } = state['features/base/jwt'];
const { customizationReady, logoClickUrl, logoImageUrl } = state['features/dynamic-branding']; const { customizationReady, logoClickUrl, logoImageUrl } = state['features/dynamic-branding'];
const { room } = state['features/base/conference'];
return { return {
/** /**
@ -285,7 +293,8 @@ function _mapStateToProps(state) {
_customLogoLink: logoClickUrl, _customLogoLink: logoClickUrl,
_customLogoUrl: logoImageUrl, _customLogoUrl: logoImageUrl,
_isGuest: isGuest, _isGuest: isGuest,
_readyToDisplayJitsiWatermark: customizationReady _readyToDisplayJitsiWatermark: customizationReady,
_welcomePageIsVisible: !room
}; };
} }