Skip to content

Commit 3204802

Browse files
authored
Merge pull request #24021 from Expensify/youssef_display_control_workspaces
Display NVP-enabled Control policies in NewDot
2 parents 82e4911 + 286f8c2 commit 3204802

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

src/libs/PolicyUtils.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import ONYXKEYS from '../ONYXKEYS';
1010
* @returns {Array}
1111
*/
1212
function getActivePolicies(policies) {
13-
return _.filter(policies, (policy) => policy && policy.type === CONST.POLICY.TYPE.FREE && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
13+
return _.filter(policies, (policy) => policy && policy.isPolicyExpenseChatEnabled && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
1414
}
1515

1616
/**
@@ -86,7 +86,7 @@ function getPolicyBrickRoadIndicatorStatus(policy, policyMembersCollection) {
8686
function shouldShowPolicy(policy, isOffline) {
8787
return (
8888
policy &&
89-
policy.type === CONST.POLICY.TYPE.FREE &&
89+
policy.isPolicyExpenseChatEnabled &&
9090
policy.role === CONST.POLICY.ROLE.ADMIN &&
9191
(isOffline || policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !_.isEmpty(policy.errors))
9292
);

src/libs/actions/Policy.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -933,6 +933,7 @@ function createWorkspace(policyOwnerEmail = '', makeMeAdmin = false, policyName
933933
name: workspaceName,
934934
role: CONST.POLICY.ROLE.ADMIN,
935935
owner: sessionEmail,
936+
isPolicyExpenseChatEnabled: true,
936937
outputCurrency: lodashGet(allPersonalDetails, [sessionAccountID, 'localCurrencyCode'], CONST.CURRENCY.USD),
937938
pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
938939
customUnits,

src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ const policySelector = (policy) =>
3636
policy && {
3737
type: policy.type,
3838
role: policy.role,
39+
isPolicyExpenseChatEnabled: policy.isPolicyExpenseChatEnabled,
3940
pendingAction: policy.pendingAction,
4041
};
4142

0 commit comments

Comments
 (0)