Skip to content

[FIX] Disable swipe when room is not joined #3319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegolmello merged 9 commits into from
Oct 20, 2021
Merged

[FIX] Disable swipe when room is not joined #3319

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cd3733e
[FIX] swipe when the user is joined and not when isn't
reinaldonetof Aug 5, 2021
434b897
Added a new conditional to check if is swipeble or not
reinaldonetof Aug 26, 2021
4235790
Merge branch 'develop' into fix.not-swipe-spotlight
reinaldonetof Aug 26, 2021
9aa9bed
Merge branch 'develop' into fix.not-swipe-spotlight
reinaldonetof Aug 31, 2021
fa21f3d
Merge branch 'develop' into fix.not-swipe-spotlight
diegolmello Sep 6, 2021
cf51148
Merge branch 'develop' into fix.not-swipe-spotlight
reinaldonetof Oct 5, 2021
93c09a0
Minor tweaks
reinaldonetof Oct 5, 2021
d66074b
Merge branch 'develop' into fix.not-swipe-spotlight
reinaldonetof Oct 8, 2021
3afe146
Merge branch 'develop' into fix.not-swipe-spotlight
diegolmello Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/lib/rocketchat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,6 +1166,10 @@ const RocketChat = {
return !isUnread;
},

isSwipeEnabled(item) {
Comment thread
reinaldonetof marked this conversation as resolved.
Outdated
return !(item?.joinCodeRequired || item?.outside);
},

isGroupChat(room) {
return (room.uids && room.uids.length > 2) || (room.usernames && room.usernames.length > 2);
},
Expand Down
4 changes: 4 additions & 0 deletions app/views/RoomsListView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,8 @@ class RoomsListView extends React.Component {

isRead = item => RocketChat.isRead(item)

isSwipeEnabled = item => RocketChat.isSwipeEnabled(item)

getUserPresence = uid => RocketChat.getUserPresence(uid)

getUidDirectMessage = room => RocketChat.getUidDirectMessage(room);
Expand Down Expand Up @@ -901,6 +903,7 @@ class RoomsListView extends React.Component {
width
} = this.props;
const id = this.getUidDirectMessage(item);
const swipeEnabled = this.isSwipeEnabled(item);

return (
<RoomItem
Expand All @@ -923,6 +926,7 @@ class RoomsListView extends React.Component {
getIsRead={this.isRead}
visitor={item.visitor}
isFocused={currentItem?.rid === item.rid}
swipeEnabled={swipeEnabled}
/>
);
};
Expand Down