From bae23c78de2e1fde9c7211480fff045429c8e071 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 15 Mar 2016 22:42:22 +0000
Subject: [PATCH] fix https://github.com/vector-im/vector-web/issues/1040 and
 https://github.com/vector-im/vector-web/issues/833

---
 src/components/structures/RoomView.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 20a058719b..dcb16f7231 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1217,11 +1217,10 @@ module.exports = React.createClass({
                 />
             );
         }
-        else if (this.state.canPeek &&
-                (!myMember || myMember.membership !== "join")) {
+        else if (!myMember || myMember.membership !== "join") {
             aux = (
                 <RoomPreviewBar onJoinClick={this.onJoinButtonClicked} canJoin={true}
-                                spinner={this.state.joining}
+                                spinner={this.state.joining} canPreview={ this.state.canPeek }
                 />
             );
         }