Make sure the SettingsStore is ready to load the theme before loading it#5630
Merged
dbkr merged 4 commits intoelement-hq:developfrom Nov 27, 2017
turt2live:travis/granular-theme
Merged
Make sure the SettingsStore is ready to load the theme before loading it#5630dbkr merged 4 commits intoelement-hq:developfrom turt2live:travis/granular-theme
dbkr merged 4 commits intoelement-hq:developfrom
turt2live:travis/granular-theme
Conversation
This is to ensure that when we make a call to get the theme we'll have the SdkConfig available. Signed-off-by: Travis Ralston <travpc@gmail.com>
This is so the `config` level is respected. Signed-off-by: Travis Ralston <travpc@gmail.com>
Signed-off-by: Travis Ralston <travpc@gmail.com>
This was referenced Nov 17, 2017
Member
Author
|
Paging @ara4n |
dbkr
reviewed
Nov 27, 2017
Member
dbkr
left a comment
There was a problem hiding this comment.
lgtm, but can we add a comment on why we're passing the config into react-sdk twice (once to SdkConfig and once as a prop to MatrixChat)?
Signed-off-by: Travis Ralston <travpc@gmail.com>
dbkr
approved these changes
Nov 27, 2017
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Required PRs
Description
This PR contains a fix for #5623 in addition to one other fix. The config has to be loaded (and set) before calling
SettingsStoreotherwise all settings at theconfiglevel are ignored. Further, it helps to callgetValueinstead ofgetValueAtif we want the config to be respected.The other included fix is to make sure the config is loaded prior to checking the user agent. This is so the default theme check reacts correctly, as per the above.
Visibility of what is going on in the diff might be a bit unclear, so going commit by commit may be better. The summary is the flow is now: load config -> check if mobile -> set theme -> rest of loading stuff