From 8abd35f581c696e13ff5fa40f361a229f79192d8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 12 Sep 2017 15:48:13 +0100
Subject: [PATCH 1/3] Remove spurious cancel button

That appeared if you clicked on a room from the room directory
(it didn't do anything). It's only supposed to be shown when
editing room settings.
---
 src/components/views/rooms/RoomHeader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 499fdf21cc..63f5a749f3 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -56,7 +56,7 @@ module.exports = React.createClass({
             editing: false,
             inRoom: false,
             onSaveClick: function() {},
-            onCancelClick: function() {},
+            onCancelClick: null,
         };
     },
 

From ffb3d718d3c6b0974ba098bc57cb5f3497fea823 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 13 Sep 2017 15:48:53 +0100
Subject: [PATCH 2/3] Fix the avatar / room name in room preview

When clicking on rooms from the room directory. When RoomViewStore
resolved the room alias, it threw away the out-of-band data in the
process. This must have been broken as part of the ILAG /
RoomViewStore stuff.
---
 src/stores/RoomViewStore.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 17fcc97160..1133c7eec5 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -153,6 +153,7 @@ class RoomViewStore extends Store {
                     event_id: payload.event_id,
                     highlighted: payload.highlighted,
                     room_alias: payload.room_alias,
+                    oob_data: payload.oob_data,
                 });
             }, (err) => {
                 dis.dispatch({

From 34134f0d43fbe0cc186c7c302d00b305d0ae5f7c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 13 Sep 2017 17:37:43 +0100
Subject: [PATCH 3/3] Fix starting a chat by email address

Regression introduced whilst refactoring for groups support.
---
 src/Invite.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Invite.js b/src/Invite.js
index b8e33d318a..9be3da53e4 100644
--- a/src/Invite.js
+++ b/src/Invite.js
@@ -127,7 +127,7 @@ function _onRoomInviteFinished(roomId, shouldInvite, addrs) {
 }
 
 function _isDmChat(addrTexts) {
-    if (addrTexts.length === 1 && getAddressType(addrTexts[0])) {
+    if (addrTexts.length === 1 && getAddressType(addrTexts[0]) === 'mx') {
         return true;
     } else {
         return false;