diff --git a/src/SdkConfig.js b/src/SdkConfig.js
deleted file mode 100644
index 11c1dd5858..0000000000
--- a/src/SdkConfig.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-var DEFAULTS = {
-};
-
-/**
- * Class that stores an instance of the SDK config dictionary
- * as a singleton such that it can be accessed from SDK
- * components without having to be passed deep though
- * multiple levels of React components.
- */
-class SdkConfig {
-
- static get() {
- return global.mxReactSdkConfig;
- }
-
- static put(cfg) {
- var defaultKeys = Object.keys(DEFAULTS);
- for (var i = 0; i < defaultKeys.length; ++i) {
- var key = defaultKeys[i];
- if (cfg[key] === undefined) {
- cfg[key] = DEFAULTS[key];
- }
- }
- global.mxReactSdkConfig = cfg;
- }
-
- static unset() {
- global.mxReactSdkConfig = undefined;
- }
-}
-
-module.exports = SdkConfig;
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 9aad4e72de..7f7bf034b8 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -19,7 +19,6 @@ var url = require('url');
var Favico = require('favico.js');
var MatrixClientPeg = require("../../MatrixClientPeg");
-var SdkConfig = require("../../SdkConfig");
var Notifier = require("../../Notifier");
var ContextualMenu = require("../../ContextualMenu");
var RoomListSorter = require("../../RoomListSorter");
@@ -124,7 +123,6 @@ module.exports = React.createClass({
},
componentWillMount: function() {
- SdkConfig.put(this.props.config);
this.favicon = new Favico({animation: 'none'});
},
@@ -1094,7 +1092,7 @@ module.exports = React.createClass({
right_panel =
break;
case this.PageTypes.UserSettings:
- page_element =
+ page_element =
right_panel =
break;
case this.PageTypes.CreateRoom:
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index e56e5d9d87..3face4649c 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -31,7 +31,9 @@ module.exports = React.createClass({
propTypes: {
version: React.PropTypes.string,
- onClose: React.PropTypes.func
+ onClose: React.PropTypes.func,
+ // The brand string given when creating email pushers
+ brand: React.PropTypes.string,
},
getDefaultProps: function() {
@@ -333,7 +335,7 @@ module.exports = React.createClass({
Notifications
-
+
);
}