From 7a985dd843ee54286d927fa197230e0e58a2e0aa Mon Sep 17 00:00:00 2001 From: Bettenbuk Zoltan Date: Tue, 23 Jul 2019 16:07:55 +0200 Subject: [PATCH] fix: disable reduced UI on welcome page --- .../welcome/components/WelcomePage.native.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/react/features/welcome/components/WelcomePage.native.js b/react/features/welcome/components/WelcomePage.native.js index 7bf56e6d7..e3205e441 100644 --- a/react/features/welcome/components/WelcomePage.native.js +++ b/react/features/welcome/components/WelcomePage.native.js @@ -98,11 +98,20 @@ class WelcomePage extends AbstractWelcomePage { * @returns {ReactElement} */ render() { + // We want to have the welcome page support the reduced UI layout, + // but we ran into serious issues enabling it so we disable it + // until we have a proper fix in place. We leave the code here though, because + // this part should be fine when the bug is fixed. + // + // NOTE: when re-enabling, don't forget to uncomment the respective _mapStateToProps line too + + /* const { _reducedUI } = this.props; if (_reducedUI) { return this._renderReducedUI(); } + */ return this._renderFullUI(); } @@ -316,12 +325,11 @@ class WelcomePage extends AbstractWelcomePage { * @returns {Object} */ function _mapStateToProps(state) { - const { reducedUI } = state['features/base/responsive-ui']; - return { ..._abstractMapStateToProps(state), - _headerStyles: ColorSchemeRegistry.get(state, 'Header'), - _reducedUI: reducedUI + _headerStyles: ColorSchemeRegistry.get(state, 'Header') + + // _reducedUI: state['features/base/responsive-ui'].reducedUI }; }