Minor tweaks
This commit is contained in:
parent
c3ffa37323
commit
69ae247329
|
@ -26,7 +26,7 @@ const createTeam = function createTeam(data) {
|
|||
};
|
||||
|
||||
const addTeamRoom = function addRoomToTeam(params) {
|
||||
return RocketChat.addTeamRoom(params);
|
||||
return RocketChat.addTeamRooms(params);
|
||||
};
|
||||
|
||||
const handleRequest = function* handleRequest({ data }) {
|
||||
|
@ -78,7 +78,6 @@ const handleRequest = function* handleRequest({ data }) {
|
|||
const channels = yield call(addTeamRoom, { rooms: sub.rid, teamId: data.teamId });
|
||||
if (channels.success) {
|
||||
sub.teamId = channels.teamId;
|
||||
sub.isTeamChannel = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ const navigate = ({ item, isMasterDetail, ...props }) => {
|
|||
navigationMethod = Navigation.replace;
|
||||
}
|
||||
|
||||
if (item.isTeamChannel) {
|
||||
if (item.rooms && item.teamId) {
|
||||
// TODO: Refactor
|
||||
Navigation.navigate('TeamChannelsView');
|
||||
Navigation.push('RoomView', {
|
||||
|
|
|
@ -149,7 +149,7 @@ class AddExistingChannelView extends React.Component {
|
|||
const result = await RocketChat.addTeamRooms({ rooms: selected, teamId: this.teamId });
|
||||
if (result.success) {
|
||||
this.setState({ loading: false });
|
||||
goRoom(result, isMasterDetail);
|
||||
goRoom({ result, isMasterDetail });
|
||||
}
|
||||
} catch (e) {
|
||||
// TODO: Log error
|
||||
|
|
|
@ -586,7 +586,10 @@ class RoomsListView extends React.Component {
|
|||
}
|
||||
|
||||
onPressItem = (item = {}) => {
|
||||
const { isMasterDetail } = this.props;
|
||||
const { navigation, isMasterDetail } = this.props;
|
||||
if (!navigation.isFocused()) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.cancelSearch();
|
||||
this.goRoom({ item, isMasterDetail });
|
||||
|
|
|
@ -109,7 +109,7 @@ class TeamChannelsView extends React.Component {
|
|||
}
|
||||
}
|
||||
|
||||
load = async() => {
|
||||
load = debounce(async() => {
|
||||
const {
|
||||
loadingMore, data, search, isSearching, searchText, end
|
||||
} = this.state;
|
||||
|
@ -153,7 +153,7 @@ class TeamChannelsView extends React.Component {
|
|||
log(e);
|
||||
this.setState({ loading: false, loadingMore: false });
|
||||
}
|
||||
}
|
||||
}, 300)
|
||||
|
||||
setHeader = () => {
|
||||
const { isSearching, showCreate, data } = this.state;
|
||||
|
|
Loading…
Reference in New Issue