From 548c392236078b29121256e5f9c86819bebb0300 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 28 Jun 2016 14:59:45 +0100
Subject: [PATCH] PR feedback

---
 src/components/structures/RoomView.js        | 3 +++
 src/components/views/rooms/RoomPreviewBar.js | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 78d9351171..776461e0e5 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -116,6 +116,9 @@ module.exports = React.createClass({
             callState: null,
             guestsCanJoin: false,
             canPeek: false,
+
+            // If we failed to load information about the room,
+            // store the error here.
             roomLoadError: null,
 
             // this is true if we are fully scrolled-down, and are looking at
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index f1b15490d7..2d83b14931 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -41,6 +41,9 @@ module.exports = React.createClass({
         canPreview: React.PropTypes.bool,
         spinner: React.PropTypes.bool,
         room: React.PropTypes.object,
+
+        // The alias that was used to access this room, if appropriate
+        roomAlias: React.PropTypes.object,
     },
 
     getDefaultProps: function() {