From 6fdd58b4813851c5b5d1fdc45cf0854eea067f28 Mon Sep 17 00:00:00 2001 From: enahum Date: Thu, 28 Sep 2017 15:16:35 -0300 Subject: [PATCH] Fix blank screen when user has no teams (#965) --- app/screens/index.js | 2 +- app/selectors/preferences.js | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/screens/index.js b/app/screens/index.js index 714688f07..67b8d7909 100644 --- a/app/screens/index.js +++ b/app/screens/index.js @@ -66,7 +66,7 @@ export function registerScreens(store, Provider) { Navigation.registerComponent('CreateChannel', () => wrapWithContextProvider(CreateChannel), store, Provider); Navigation.registerComponent('EditPost', () => wrapWithContextProvider(EditPost), store, Provider); Navigation.registerComponent('ImagePreview', () => wrapWithContextProvider(ImagePreview), store, Provider); - Navigation.registerComponent('LoadTeam', () => wrapWithContextProvider(LoadTeam), store, Provider); + Navigation.registerComponent('LoadTeam', () => wrapWithContextProvider(LoadTeam, false), store, Provider); Navigation.registerComponent('Login', () => wrapWithContextProvider(Login), store, Provider); Navigation.registerComponent('LoginOptions', () => wrapWithContextProvider(LoginOptions), store, Provider); Navigation.registerComponent('MFA', () => wrapWithContextProvider(Mfa), store, Provider); diff --git a/app/selectors/preferences.js b/app/selectors/preferences.js index aef879c36..9fd849946 100644 --- a/app/selectors/preferences.js +++ b/app/selectors/preferences.js @@ -46,8 +46,10 @@ export const getTheme = createSelector( // At this point, the theme should be a plain object // Fix a case where upper case theme colours are rendered as black - for (const key of Object.keys(theme)) { - theme[key] = theme[key].toLowerCase(); + if (currentTeamId) { + for (const key of Object.keys(theme)) { + theme[key] = theme[key].toLowerCase(); + } } return theme;