diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 093fae5d7b..0790a5766e 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -301,13 +301,13 @@ export default React.createClass({
case PageTypes.UserView:
page_element = null; // deliberately null for now
- right_panel = ;
+ right_panel = ;
break;
case PageTypes.GroupView:
page_element = ;
- //right_panel = ;
+ //right_panel = ;
break;
}
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 6fdec80f38..a512d60509 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1203,21 +1203,22 @@ module.exports = React.createClass({
} else if (screen.indexOf('user/') == 0) {
const userId = screen.substring(5);
- if (params.action === 'chat') {
- this._chatCreateOrReuse(userId);
- return;
- }
+ const waitFor = this.firstSyncPromise ?
+ this.firstSyncPromise.promise : Promise.resolve();
+ waitFor.then(() => {
+ if (params.action === 'chat') {
+ this._chatCreateOrReuse(userId);
+ return;
+ }
- this.setState({ viewUserId: userId });
- this._setPage(PageTypes.UserView);
- this.notifyNewScreen('user/' + userId);
- const member = new Matrix.RoomMember(null, userId);
- if (member) {
+ this._setPage(PageTypes.UserView);
+ this.notifyNewScreen('user/' + userId);
+ const member = new Matrix.RoomMember(null, userId);
dis.dispatch({
action: 'view_user',
member: member,
});
- }
+ });
} else if (screen.indexOf('group/') == 0) {
const groupId = screen.substring(6);