From 977599a6603aeb47469d281518fcafe4e2301a5e Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 13 Nov 2017 13:14:29 -0700 Subject: [PATCH] Use the SettingsStore to get the theme Signed-off-by: Travis Ralston --- src/components/views/login/VectorLoginFooter.js | 4 ++-- src/vector/index.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/views/login/VectorLoginFooter.js b/src/components/views/login/VectorLoginFooter.js index e5243f8e..1289e84b 100644 --- a/src/components/views/login/VectorLoginFooter.js +++ b/src/components/views/login/VectorLoginFooter.js @@ -18,7 +18,7 @@ limitations under the License. var React = require('react'); import { _t } from 'matrix-react-sdk/lib/languageHandler'; -import UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore'; +import SettingsStore from 'matrix-react-sdk/lib/settings/SettingsStore'; module.exports = React.createClass({ displayName: 'VectorLoginFooter', @@ -28,7 +28,7 @@ module.exports = React.createClass({ render: function() { // FIXME: replace this with a proper Status skin - if (UserSettingsStore.getTheme() === 'status') return
; + if (SettingsStore.getValue("theme") === 'status') return
; return (
diff --git a/src/vector/index.js b/src/vector/index.js index 053839a3..b896d764 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -252,7 +252,7 @@ async function loadApp() { if (!preventRedirect) { if (/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream) { // FIXME: ugly status hardcoding - if (UserSettingsStore.getTheme() === 'status') { + if (SettingsStore.getValue("theme") === 'status') { window.location = "https://status.im/join-riot.html"; return; } @@ -265,7 +265,7 @@ async function loadApp() { } else if (/Android/.test(navigator.userAgent)) { // FIXME: ugly status hardcoding - if (UserSettingsStore.getTheme() === 'status') { + if (SettingsStore.getValue("theme") === 'status') { window.location = "https://status.im/join-riot.html"; return; }