Merge remote-tracking branch 'nv/develop' into joriks/irc-ui

src/components/structures/MatrixChat.tsx

@@ -623,7 +623,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 break;
             }
             case 'view_create_room':
-                this.createRoom();
+                this.createRoom(payload.public);
                 break;
             case 'view_create_group': {
                 const CreateGroupDialog = sdk.getComponent("dialogs.CreateGroupDialog");
@@ -1012,9 +1012,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         }).close;
     }
 
-    private async createRoom() {
+    private async createRoom(defaultPublic = false) {
         const CreateRoomDialog = sdk.getComponent('dialogs.CreateRoomDialog');
-        const modal = Modal.createTrackedDialog('Create Room', '', CreateRoomDialog);
+        const modal = Modal.createTrackedDialog('Create Room', '', CreateRoomDialog, { defaultPublic });
 
         const [shouldCreate, opts] = await modal.finished;
         if (shouldCreate) {
@@ -1339,7 +1339,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             // this if we are not scrolled up in the view. To find out, delegate to
             // the timeline panel. If the timeline panel doesn't exist, then we assume
             // it is safe to reset the timeline.
-            if (!this.loggedInView.current || !this.loggedInView.current) {
+            if (!this.loggedInView.current) {
                 return true;
             }
             return this.loggedInView.current.canResetTimelineInRoom(roomId);

src/components/structures/RightPanel.js

@@ -227,7 +227,7 @@ export default class RightPanel extends React.Component {
                         if (this.props.user) {
                             // If we have a user prop then we're displaying a user from the 'user' page type
                             // in LoggedInView, so need to change the page type to close the panel (we switch
-                            // to the home page which is not obviosuly the correct thing to do, but I'm not sure
+                            // to the home page which is not obviously the correct thing to do, but I'm not sure
                             // anything else is - we could hide the close button altogether?)
                             dis.dispatch({
                                 action: "view_home_page",

src/components/structures/RoomDirectory.js

@@ -367,7 +367,10 @@ export default createReactClass({
 
     onCreateRoomClick: function(room) {
         this.props.onFinished();
-        dis.dispatch({action: 'view_create_room'});
+        dis.dispatch({
+            action: 'view_create_room',
+            public: true,
+        });
     },
 
     showRoomAlias: function(alias, autoJoin=false) {

src/components/structures/RoomView.js

@@ -1717,8 +1717,11 @@ export default createReactClass({
             } else {
                 const myUserId = this.context.credentials.userId;
                 const myMember = this.state.room.getMember(myUserId);
-                const inviteEvent = myMember.events.member;
-                var inviterName = inviteEvent.sender ? inviteEvent.sender.name : inviteEvent.getSender();
+                const inviteEvent = myMember ? myMember.events.member : null;
+                let inviterName = _t("Unknown");
+                if (inviteEvent) {
+                    inviterName = inviteEvent.sender ? inviteEvent.sender.name : inviteEvent.getSender();
+                }
 
                 // We deliberately don't try to peek into invites, even if we have permission to peek
                 // as they could be a spam vector.

src/components/structures/UserView.js

@@ -42,7 +42,10 @@ export default class UserView extends React.Component {
     }
 
     componentDidUpdate(prevProps) {
-        if (prevProps.userId !== this.props.userId) {
+        // XXX: We shouldn't need to null check the userId here, but we declare
+        // it as optional and MatrixChat sometimes fires in a way which results
+        // in an NPE when we try to update the profile info.
+        if (prevProps.userId !== this.props.userId && this.props.userId) {
             this._loadProfileInfo();
         }
     }

src/components/structures/auth/Registration.js

@@ -267,6 +267,7 @@ export default createReactClass({
                         dis.dispatch({action: 'start_login'});
                     } else {
                         this.setState({
+                            serverErrorIsFatal: true, // fatal because user cannot continue on this server
                             errorText: _t("Registration has been disabled on this homeserver."),
                             // add empty flows array to get rid of spinner
                             flows: [],