From fa14d0ed3c2e6f84ab38448faac2c14b51bc3e96 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 15 Oct 2018 14:41:00 -0600
Subject: [PATCH 1/3] Move tinter init to MatrixChat

This is a much better place for it to live
---
 src/components/structures/MatrixChat.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index db5e898946..f385aacd40 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1403,6 +1403,11 @@ export default React.createClass({
                     break;
             }
         });
+
+        // Fire the tinter right on startup to ensure the default theme is applied
+        // A later sync can/will correct the tint to be the right value for the user
+        const color_scheme = SettingsStore.getValue("roomColor");
+        Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
     },
 
     /**

From 0f592f5887575470f47adcf9b84f02d9441b0bd7 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 19 Oct 2018 16:39:07 +0200
Subject: [PATCH 2/3] Prepare changelog for v0.14.1

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40cb8c5283..00b035ac9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.14.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.1) (2018-10-19)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.0...v0.14.1)
+
+ * Apply the user's tint once the MatrixClientPeg is moderately ready
+   [\#2214](https://github.com/matrix-org/matrix-react-sdk/pull/2214)
+
 Changes in [0.14.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.0) (2018-10-16)
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.0-rc.1...v0.14.0)

From 167746f41d891d053643e061a583489f2826755a Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 19 Oct 2018 16:39:08 +0200
Subject: [PATCH 3/3] v0.14.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 93cbcd1c67..38ed26f23c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {