verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Minor tweaks

This commit is contained in:
Gerzon Z 2021-05-05 02:37:57 -04:00
parent c3ffa37323
commit 69ae247329
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/sagas/createChannel.js
View File

@ -26,7 +26,7 @@ const createTeam = function createTeam(data) {
}; };
const addTeamRoom = function addRoomToTeam(params) { const addTeamRoom = function addRoomToTeam(params) {
return RocketChat.addTeamRoom(params); return RocketChat.addTeamRooms(params);
}; };
const handleRequest = function* handleRequest({ data }) { 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 }); const channels = yield call(addTeamRoom, { rooms: sub.rid, teamId: data.teamId });
if (channels.success) { if (channels.success) {
sub.teamId = channels.teamId; sub.teamId = channels.teamId;
sub.isTeamChannel = true;
} }
} }
} }

2
app/utils/goRoom.js
View File

@ -8,7 +8,7 @@ const navigate = ({ item, isMasterDetail, ...props }) => {
navigationMethod = Navigation.replace; navigationMethod = Navigation.replace;
} }
if (item.isTeamChannel) { if (item.rooms && item.teamId) {
// TODO: Refactor // TODO: Refactor
Navigation.navigate('TeamChannelsView'); Navigation.navigate('TeamChannelsView');
Navigation.push('RoomView', { Navigation.push('RoomView', {

2
app/views/AddExistingChannelView.js
View File

@ -149,7 +149,7 @@ class AddExistingChannelView extends React.Component {
const result = await RocketChat.addTeamRooms({ rooms: selected, teamId: this.teamId }); const result = await RocketChat.addTeamRooms({ rooms: selected, teamId: this.teamId });
if (result.success) { if (result.success) {
this.setState({ loading: false }); this.setState({ loading: false });
goRoom(result, isMasterDetail); goRoom({ result, isMasterDetail });
} }
} catch (e) { } catch (e) {
// TODO: Log error // TODO: Log error

5
app/views/RoomsListView/index.js
View File

@ -586,7 +586,10 @@ class RoomsListView extends React.Component {
} }
onPressItem = (item = {}) => { onPressItem = (item = {}) => {
const { isMasterDetail } = this.props; const { navigation, isMasterDetail } = this.props;
if (!navigation.isFocused()) {
return;
}
this.cancelSearch(); this.cancelSearch();
this.goRoom({ item, isMasterDetail }); this.goRoom({ item, isMasterDetail });

4
app/views/TeamChannelsView.js
View File

@ -109,7 +109,7 @@ class TeamChannelsView extends React.Component {
} }
} }
load = async() => { load = debounce(async() => {
const { const {
loadingMore, data, search, isSearching, searchText, end loadingMore, data, search, isSearching, searchText, end
} = this.state; } = this.state;
@ -153,7 +153,7 @@ class TeamChannelsView extends React.Component {
log(e); log(e);
this.setState({ loading: false, loadingMore: false }); this.setState({ loading: false, loadingMore: false });
} }
} }, 300)
setHeader = () => { setHeader = () => {
const { isSearching, showCreate, data } = this.state; const { isSearching, showCreate, data } = this.state;