Skip to content

[FIX] Don't show Block Button inside Group DM Actions #3195

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 4 commits into from
Jun 10, 2021
Merged

[FIX] Don't show Block Button inside Group DM Actions #3195

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be36b04
[FIX] Don't show Block Button inside Group DM Actions
reinaldonetof Jun 7, 2021
be8d75b
Use RocketChat.isGroupChat instead of simple if condition
reinaldonetof Jun 10, 2021
6af8c93
Add return
diegolmello Jun 10, 2021
e4e3a86
Merge branch 'develop' into fix.dont-show-block-group-dm
diegolmello Jun 10, 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: 2 additions & 2 deletions app/views/RoomActionsView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,13 +713,13 @@ class RoomActionsView extends React.Component {
renderLastSection = () => {
const { room, joined } = this.state;
const { theme } = this.props;
const { t, blocker } = room;
const { t, blocker, usernames } = room;

if (!joined || t === 'l') {
return null;
}

if (t === 'd') {
if (t === 'd' && usernames.length === 2) {

@diegolmello diegolmello Jun 10, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use RocketChat.isGroupChat

return (
<List.Section>
<List.Separator />
Expand Down