sergiodt
/
vn-verdnaturachat
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIX] Blink header DM (#2093) 

* [FIX] Blink header DM

* Remove query

* [FIX] Push RoomInfoView

* remove unnecessary try/catch

* [FIX] RoomInfo > Message (Tablet)

Co-authored-by: Diego Mello <diegolmello@gmail.com>
This commit is contained in:
Djorkaeff Alexandre 2020-05-11 11:19:28 -03:00 committed by GitHub
parent bfce5c8c87
commit 364d56a597
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/views/RoomInfoView/index.js
View File

@ -21,9 +21,11 @@ import StatusBar from '../../containers/StatusBar';
import log from '../../utils/log'; import log from '../../utils/log';
import { themes } from '../../constants/colors'; import { themes } from '../../constants/colors';
import { withTheme } from '../../theme'; import { withTheme } from '../../theme';
import { withSplit } from '../../split';
import { themedHeader } from '../../utils/navigation'; import { themedHeader } from '../../utils/navigation';
import { getUserSelector } from '../../selectors/login'; import { getUserSelector } from '../../selectors/login';
import Markdown from '../../containers/markdown'; import Markdown from '../../containers/markdown';
import Navigation from '../../lib/Navigation';
import Livechat from './Livechat'; import Livechat from './Livechat';
import Channel from './Channel'; import Channel from './Channel';
@ -78,6 +80,8 @@ class RoomInfoView extends React.Component {
token: PropTypes.string token: PropTypes.string
}), }),
baseUrl: PropTypes.string, baseUrl: PropTypes.string,
rooms: PropTypes.array,
split: PropTypes.bool,
theme: PropTypes.string theme: PropTypes.string
} }
@ -229,16 +233,31 @@ class RoomInfoView extends React.Component {
} }
} }
goRoom = async() => { goRoom = () => {
const { roomUser, room } = this.state; const { roomUser, room } = this.state;
const { navigation } = this.props; const { name, username } = roomUser;
try { const { rooms, navigation, split } = this.props;
if (room.rid) {
await navigation.navigate('RoomsListView'); if (room.rid) {
navigation.navigate('RoomView', { rid: room.rid, name: RocketChat.getRoomTitle(roomUser), t: 'd' }); let navigate = navigation.push;
// if this is a room focused
if (rooms.includes(room.rid)) {
({ navigate } = navigation);
} else if (split) {
({ navigate } = Navigation);
} }
} catch (e) {
// do nothing navigate('RoomView', {
rid: room.rid,
name: RocketChat.getRoomTitle({
t: room.t,
fname: name,
name: username
}),
t: room.t,
roomUserId: RocketChat.getUidDirectMessage(room)
});
} }
} }
@ -326,7 +345,8 @@ class RoomInfoView extends React.Component {
const mapStateToProps = state => ({ const mapStateToProps = state => ({
baseUrl: state.server.server, baseUrl: state.server.server,
user: getUserSelector(state) user: getUserSelector(state),
rooms: state.room.rooms
}); });
export default connect(mapStateToProps)(withTheme(RoomInfoView)); export default connect(mapStateToProps)(withSplit(withTheme(RoomInfoView)));

2
app/views/RoomView/index.js
View File

@ -766,7 +766,7 @@ class RoomView extends React.Component {
navigation.navigate('RoomActionsView', { rid: this.rid, t: this.t, room }); navigation.navigate('RoomActionsView', { rid: this.rid, t: this.t, room });
ModalNavigation.navigate('RoomInfoView', navParam); ModalNavigation.navigate('RoomInfoView', navParam);
} else { } else {
navigation.navigate('RoomInfoView', navParam); navigation.push('RoomInfoView', navParam);
} }
} }