Skip to content

Commit 6907d54

Browse files
committed
Users missing in the modal to add to the approval flow
1 parent 8dcc9d3 commit 6907d54

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/libs/PolicyUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ function getApprovalWorkflow(policy: OnyxEntry<Policy> | SearchPolicy): ValueOf<
678678
}
679679

680680
function getDefaultApprover(policy: OnyxEntry<Policy> | SearchPolicy): string {
681-
return policy?.approver ?? policy?.owner ?? '';
681+
return (policy?.approver || policy?.owner) ?? '';
682682
}
683683

684684
function getRuleApprovers(policy: OnyxEntry<Policy> | SearchPolicy, expenseReport: OnyxEntry<Report>) {

src/pages/workspace/WorkspaceMembersPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
150150
() =>
151151
convertPolicyEmployeesToApprovalWorkflows({
152152
employees: policy?.employeeList ?? {},
153-
defaultApprover: policyApproverEmail ?? policy?.owner ?? '',
153+
defaultApprover: (policyApproverEmail || policy?.owner) ?? '',
154154
personalDetails: personalDetails ?? {},
155155
localeCompare,
156156
}),

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
109109
() =>
110110
convertPolicyEmployeesToApprovalWorkflows({
111111
employees: policy?.employeeList ?? {},
112-
defaultApprover: policyApproverEmail ?? policy?.owner ?? '',
112+
defaultApprover: (policyApproverEmail || policy?.owner) ?? '',
113113
personalDetails: personalDetails ?? {},
114114
localeCompare,
115115
}),

src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ function WorkspaceWorkflowsPage({policy, route}: WorkspaceWorkflowsPageProps) {
8080
() =>
8181
convertPolicyEmployeesToApprovalWorkflows({
8282
employees: policy?.employeeList ?? {},
83-
defaultApprover: policyApproverEmail ?? policy?.owner ?? '',
83+
defaultApprover: (policyApproverEmail || policy?.owner) ?? '',
8484
personalDetails: personalDetails ?? {},
8585
localeCompare,
8686
}),

0 commit comments

Comments
 (0)