From d943807ad1e9a8e70071a422bcb641ce27a757aa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 19 Nov 2017 13:18:06 +0000
Subject: [PATCH 1/2] remove unused imports

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomDetailRow.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/views/rooms/RoomDetailRow.js b/src/components/views/rooms/RoomDetailRow.js
index fbb9db4505..4725bb4a14 100644
--- a/src/components/views/rooms/RoomDetailRow.js
+++ b/src/components/views/rooms/RoomDetailRow.js
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import sdk from '../../../index';
-import dis from '../../../dispatcher';
 import React from 'react';
 import { _t } from '../../../languageHandler';
 import linkifyElement from 'linkifyjs/element';
@@ -23,9 +22,8 @@ import linkifyMatrix from '../../../linkify-matrix';
 import { ContentRepo } from 'matrix-js-sdk';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import PropTypes from 'prop-types';
-import classNames from 'classnames';
 
-function getDisplayAliasForRoom(room) {
+export function getDisplayAliasForRoom(room) {
     return room.canonicalAlias || (room.aliases ? room.aliases[0] : "");
 }
 

From 4d177626b5395345f84f56f65b9c74caaf5651a3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 19 Nov 2017 13:24:18 +0000
Subject: [PATCH 2/2] init Linkify properly to make tests happy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomDetailRow.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/views/rooms/RoomDetailRow.js b/src/components/views/rooms/RoomDetailRow.js
index 4725bb4a14..f7dc9086ec 100644
--- a/src/components/views/rooms/RoomDetailRow.js
+++ b/src/components/views/rooms/RoomDetailRow.js
@@ -17,12 +17,15 @@ limitations under the License.
 import sdk from '../../../index';
 import React from 'react';
 import { _t } from '../../../languageHandler';
+import * as linkify from 'linkifyjs';
 import linkifyElement from 'linkifyjs/element';
 import linkifyMatrix from '../../../linkify-matrix';
 import { ContentRepo } from 'matrix-js-sdk';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import PropTypes from 'prop-types';
 
+linkifyMatrix(linkify);
+
 export function getDisplayAliasForRoom(room) {
     return room.canonicalAlias || (room.aliases ? room.aliases[0] : "");
 }