Merge branch 'fix/profile-not-loading-without-persisted-state' into 'develop'

Fix #324 Profiles sometimes not loading when there's no persisted state

Closes #324

See merge request pleroma/pleroma-fe!553
This commit is contained in:
Shpuld Shpludson 2019-02-11 13:34:03 +00:00
commit b6bac4d06d
4 changed files with 9 additions and 5 deletions

View file

@ -480,7 +480,7 @@ const getThemes = () => {
}
const setPreset = (val, commit) => {
getThemes().then((themes) => {
return getThemes().then((themes) => {
const theme = themes[val] ? themes[val] : themes['pleroma-dark']
const isV1 = Array.isArray(theme)
const data = isV1 ? {} : theme.theme