Skip to content

Fix/disable new room non workspace members #7829

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
NikkiWines merged 5 commits into from
Feb 23, 2022
Merged

Fix/disable new room non workspace members #7829

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d74c2d0
fix: Added policies length check for new room
mananjadhav Feb 19, 2022
cbca1d9
fix: Changed condition for workspace count
mananjadhav Feb 19, 2022
4f29365
fix: Added comment for workspace condition
mananjadhav Feb 20, 2022
5f39a75
fix: Changed check to just length
mananjadhav Feb 23, 2022
f3a3f37
Merge branch 'main' of https://github.com/mananjadhav/App into fix/di…
mananjadhav Feb 23, 2022
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
5 changes: 4 additions & 1 deletion src/pages/home/sidebar/SidebarScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import lodashGet from 'lodash/get';
import _ from 'underscore';
import React, {Component} from 'react';
import {View} from 'react-native';
import {withOnyx} from 'react-native-onyx';
Expand Down Expand Up @@ -96,6 +97,8 @@ class SidebarScreen extends Component {
}

render() {
// Workspaces are policies with type === 'free'
const workspaces = _.filter(this.props.allPolicies, policy => policy && policy.type === CONST.POLICY.TYPE.FREE);
Comment thread
mananjadhav marked this conversation as resolved.
return (
<ScreenWrapper
includePaddingBottom={false}
Expand Down Expand Up @@ -134,7 +137,7 @@ class SidebarScreen extends Component {
text: this.props.translate('sidebarScreen.newGroup'),
onSelected: () => Navigation.navigate(ROUTES.NEW_GROUP),
},
...(Permissions.canUsePolicyRooms(this.props.betas) ? [
...(Permissions.canUsePolicyRooms(this.props.betas) && workspaces.length ? [
{
icon: Expensicons.Hashtag,
text: this.props.translate('sidebarScreen.newRoom'),
Expand Down