Always change to LOGGED_IN view to show a room
parent
477d5ac0dc
commit
4101d4e9de
|
@ -819,6 +819,7 @@ export default React.createClass({
|
||||||
this.focusComposer = true;
|
this.focusComposer = true;
|
||||||
|
|
||||||
const newState = {
|
const newState = {
|
||||||
|
view: VIEWS.LOGGED_IN,
|
||||||
currentRoomId: roomInfo.room_id || null,
|
currentRoomId: roomInfo.room_id || null,
|
||||||
page_type: PageTypes.RoomView,
|
page_type: PageTypes.RoomView,
|
||||||
thirdPartyInvite: roomInfo.third_party_invite,
|
thirdPartyInvite: roomInfo.third_party_invite,
|
||||||
|
@ -1556,11 +1557,7 @@ export default React.createClass({
|
||||||
payload.room_id = roomString;
|
payload.room_id = roomString;
|
||||||
}
|
}
|
||||||
|
|
||||||
// we can't view a room unless we're logged in
|
dis.dispatch(payload);
|
||||||
// (a guest account is fine)
|
|
||||||
if (this.state.view === VIEWS.LOGGED_IN) {
|
|
||||||
dis.dispatch(payload);
|
|
||||||
}
|
|
||||||
} else if (screen.indexOf('user/') == 0) {
|
} else if (screen.indexOf('user/') == 0) {
|
||||||
const userId = screen.substring(5);
|
const userId = screen.substring(5);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue