diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index b9935a8d1b..d762a85042 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -385,7 +385,7 @@ module.exports = React.createClass({
let header;
// FIXME: remove status.im theme tweaks
- const theme = UserSettingsStore.getTheme();
+ const theme = SettingsStore.getValue("theme");
if (theme !== "status") {
header =
{ _t('Sign in') }
;
}
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index 4ef035bb1a..709bb0b7f6 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -26,8 +26,8 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
import RegistrationForm from '../../views/login/RegistrationForm';
import RtsClient from '../../../RtsClient';
import { _t } from '../../../languageHandler';
-import UserSettingsStore from '../../../UserSettingsStore';
import SdkConfig from '../../../SdkConfig';
+import SettingsStore from "../../../settings/SettingsStore";
const MIN_PASSWORD_LENGTH = 6;
@@ -329,7 +329,7 @@ module.exports = React.createClass({
const Spinner = sdk.getComponent("elements.Spinner");
const ServerConfig = sdk.getComponent('views.login.ServerConfig');
- const theme = UserSettingsStore.getTheme();
+ const theme = SettingsStore.getValue("theme");
let registerBody;
if (this.state.doingUIAuth) {
diff --git a/src/components/views/login/LoginPage.js b/src/components/views/login/LoginPage.js
index b971ecd1df..9eba53188e 100644
--- a/src/components/views/login/LoginPage.js
+++ b/src/components/views/login/LoginPage.js
@@ -16,7 +16,7 @@ limitations under the License.
'use strict';
-import UserSettingsStore from '../../../UserSettingsStore';
+import SettingsStore from "../../../settings/SettingsStore";
const React = require('react');
@@ -25,7 +25,7 @@ module.exports = React.createClass({
render: function() {
// FIXME: this should be turned into a proper skin with a StatusLoginPage component
- if (UserSettingsStore.getTheme() === 'status') {
+ if (SettingsStore.getValue("theme") === 'status') {
return (
diff --git a/src/components/views/login/RegistrationForm.js b/src/components/views/login/RegistrationForm.js
index 5ba93ec272..b3673d3b96 100644
--- a/src/components/views/login/RegistrationForm.js
+++ b/src/components/views/login/RegistrationForm.js
@@ -22,8 +22,8 @@ import Email from '../../../email';
import { looksValid as phoneNumberLooksValid } from '../../../phonenumber';
import Modal from '../../../Modal';
import { _t } from '../../../languageHandler';
-import UserSettingsStore from '../../../UserSettingsStore';
import SdkConfig from '../../../SdkConfig';
+import SettingsStore from "../../../settings/SettingsStore";
const FIELD_EMAIL = 'field_email';
const FIELD_PHONE_COUNTRY = 'field_phone_country';
@@ -275,7 +275,7 @@ module.exports = React.createClass({
render: function() {
const self = this;
- const theme = UserSettingsStore.getTheme();
+ const theme = SettingsStore.getValue("theme");
// FIXME: remove hardcoded Status team tweaks at some point
const emailPlaceholder = theme === 'status' ? _t("Email address") : _t("Email address (optional)");