Skip to content

Decouple policyRoom and defaultRoom betas #9291

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
ctkochan22 merged 5 commits into from
Jun 3, 2022
Merged

Decouple policyRoom and defaultRoom betas #9291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89ff779
Decouple policyRoom and defaultRoom betas
Jun 2, 2022
50b7a26
Fix report screen for user created policy rooms beta
Jun 2, 2022
29cd284
Fix new room page for user created policy room beta
Jun 2, 2022
6ab4144
Merge branch 'main' of github.com:Expensify/App into amal-decouple-be…
Jun 2, 2022
e22e97b
Fix log
Jun 2, 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
12 changes: 8 additions & 4 deletions src/libs/OptionsListUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ function getOptions(reports, personalDetails, activeReportID, {
selectedOptions = [],
maxRecentReportsToShow = 0,
excludeLogins = [],
excludeDefaultRooms = false,
excludeChatRooms = false,
includeMultipleParticipantReports = false,
includePersonalDetails = false,
includeRecentReports = false,
Expand Down Expand Up @@ -439,18 +439,22 @@ function getOptions(reports, personalDetails, activeReportID, {
return;
}

if (isChatRoom && (!Permissions.canUseDefaultRooms(betas) || excludeDefaultRooms)) {
if (isChatRoom && excludeChatRooms) {
return;
}

if (isPolicyExpenseChat && !Permissions.canUsePolicyExpenseChat(betas)) {
if (ReportUtils.isDefaultRoom(report) && !Permissions.canUseDefaultRooms(betas)) {
return;
}

if (ReportUtils.isUserCreatedPolicyRoom(report) && !Permissions.canUsePolicyRooms(betas)) {
return;
}

if (isPolicyExpenseChat && !Permissions.canUsePolicyExpenseChat(betas)) {
return;
}

// Save the report in the map if this is a single participant so we can associate the reportID with the
// personal detail option later. Individuals should not be associated with single participant
// policyExpenseChats or chatRooms since those are not people.
Expand Down Expand Up @@ -703,7 +707,7 @@ function getNewChatOptions(
betas,
searchValue: searchValue.trim(),
selectedOptions,
excludeDefaultRooms: true,
excludeChatRooms: true,
includeRecentReports: true,
includePersonalDetails: true,
maxRecentReportsToShow: 5,
Expand Down
6 changes: 5 additions & 1 deletion src/pages/home/ReportScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,11 @@ class ReportScreen extends React.Component {
return null;
}

if (!Permissions.canUseDefaultRooms(this.props.betas) && ReportUtils.isChatRoom(this.props.report)) {
if (!Permissions.canUseDefaultRooms(this.props.betas) && ReportUtils.isDefaultRoom(this.props.report)) {
return null;
}

if (!Permissions.canUsePolicyRooms(this.props.betas) && ReportUtils.isUserCreatedPolicyRoom(this.props.report)) {
return null;
}

Expand Down
4 changes: 2 additions & 2 deletions src/pages/workspace/WorkspaceNewRoomPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ class WorkspaceNewRoomPage extends React.Component {
}

render() {
if (!Permissions.canUseDefaultRooms(this.props.betas)) {
Log.info('Not showing create Policy Room page since user is not on default rooms beta');
if (!Permissions.canUsePolicyRooms(this.props.betas)) {
Log.info('Not showing create Policy Room page since user is not on policy rooms beta');
Navigation.dismissModal();
return null;
}
Expand Down