OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'travis/EL/appearance-tab' into 'element' 

Fix appearance tab saying the wrong theme is selected

See merge request new-vector/element/element-web/matrix-react-sdk!17
pull/21833/head
Travis Ralston 2020-07-14 18:00:59 +00:00
parent 37776447d4 3a8b3e26ac
commit 4903ce55bb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
View File

@ -89,7 +89,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
// We have to mirror the logic from ThemeWatcher.getEffectiveTheme so we // We have to mirror the logic from ThemeWatcher.getEffectiveTheme so we
// show the right values for things. // show the right values for things.
const themeChoice: string = SettingsStore.getValueAt(SettingLevel.ACCOUNT, "theme"); const themeChoice: string = SettingsStore.getValue("theme");
const systemThemeExplicit: boolean = SettingsStore.getValueAt( const systemThemeExplicit: boolean = SettingsStore.getValueAt(
SettingLevel.DEVICE, "use_system_theme", null, false, true); SettingLevel.DEVICE, "use_system_theme", null, false, true);
const themeExplicit: string = SettingsStore.getValueAt( const themeExplicit: string = SettingsStore.getValueAt(