From 349b472056d55cc8df66da1cff5bef89616468dc Mon Sep 17 00:00:00 2001
From: Minhaz A V <minhazav@gmail.com>
Date: Wed, 23 Mar 2016 15:17:07 +0530
Subject: [PATCH] logic to show/hide toolbar shifted to MatrixChat::render

Signed-off-by: Minhaz A V <minhazav@gmail.com>
---
 src/components/structures/MatrixChat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index c16b80ec62..eb75df88ba 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1046,7 +1046,7 @@ module.exports = React.createClass({
             if (MatrixClientPeg.get().isGuest()) {
                 topBar = <GuestWarningBar />;
             }
-            else if (Notifier.supportsDesktopNotifications() && !Notifier.isEnabled() && !Notifier.isToolbarHidden()) {
+            else if (Notifier.supportsDesktopNotifications() && Notifier.shouldShowToolbar()) {
                 topBar = <MatrixToolbar />;
             }
             else if (this.state.hasNewVersion) {