From 37fd19290f0cdbe07052cee2b31e9696d69a6a47 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 20 Oct 2017 18:42:29 +0100
Subject: [PATCH] concept of default theme

---
 src/components/structures/MatrixChat.js   | 2 +-
 src/components/structures/UserSettings.js | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 3fa628b8a3..9e476714ec 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -888,7 +888,7 @@ module.exports = React.createClass({
      */
     _onSetTheme: function(theme) {
         if (!theme) {
-            theme = 'light';
+            theme = this.props.config.default_theme || 'light';
         }
 
         // look for the stylesheet elements.
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index b69bea9282..e98bb844cc 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -179,6 +179,11 @@ const THEMES = [
         label: _td('Dark theme'),
         value: 'dark',
     },
+    {
+        id: 'theme',
+        label: _td('Status.im theme'),
+        value: 'status',
+    },
 ];
 
 const IgnoredUser = React.createClass({
@@ -279,7 +284,7 @@ module.exports = React.createClass({
 
         const syncedSettings = UserSettingsStore.getSyncedSettings();
         if (!syncedSettings.theme) {
-            syncedSettings.theme = 'light';
+            syncedSettings.theme = SdkConfig.get().default_theme || 'light';
         }
         this._syncedSettings = syncedSettings;