diff --git a/src/pages/workspace/WorkspaceInviteMessageApproverPage.tsx b/src/pages/workspace/WorkspaceInviteMessageApproverPage.tsx index b38d687eebaa..8a648e0f411f 100644 --- a/src/pages/workspace/WorkspaceInviteMessageApproverPage.tsx +++ b/src/pages/workspace/WorkspaceInviteMessageApproverPage.tsx @@ -9,16 +9,18 @@ import {setWorkspaceInviteApproverDraft} from '@libs/actions/Policy/Member'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {SettingsNavigatorParamList} from '@libs/Navigation/types'; -import {getDefaultApprover, getMemberAccountIDsForWorkspace} from '@libs/PolicyUtils'; +import {getDefaultApprover, getMemberAccountIDsForWorkspace, goBackFromInvalidPolicy} from '@libs/PolicyUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type SCREENS from '@src/SCREENS'; +import {isEmptyObject} from '@src/types/utils/EmptyObject'; import React from 'react'; import type {WithPolicyAndFullscreenLoadingProps} from './withPolicyAndFullscreenLoading'; +import AccessOrNotFoundWrapper from './AccessOrNotFoundWrapper'; import MemberRightIcon from './MemberRightIcon'; import withPolicyAndFullscreenLoading from './withPolicyAndFullscreenLoading'; @@ -110,16 +112,24 @@ function WorkspaceInviteMessageApproverPage({policy, personalDetails, isLoadingR }; return ( - + + + ); } diff --git a/src/pages/workspace/members/WorkspaceMemberCustomFieldPage.tsx b/src/pages/workspace/members/WorkspaceMemberCustomFieldPage.tsx index dfe8798d7d46..0f57c45e7e09 100644 --- a/src/pages/workspace/members/WorkspaceMemberCustomFieldPage.tsx +++ b/src/pages/workspace/members/WorkspaceMemberCustomFieldPage.tsx @@ -58,6 +58,8 @@ function WorkspaceMemberCustomFieldPage({policy, route, personalDetails}: Worksp { diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsOverLimitApproverPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsOverLimitApproverPage.tsx index bc64568bfa4d..dad09d930fc3 100644 --- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsOverLimitApproverPage.tsx +++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsOverLimitApproverPage.tsx @@ -13,7 +13,7 @@ import {isAnyHRReadOnlyWorkflowMode} from '@libs/HRUtils'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {WorkspaceSplitNavigatorParamList} from '@libs/Navigation/types'; -import {canMemberWrite, getMemberAccountIDsForWorkspace, isExpensifyTeam, shouldFilterExpensifyTeam} from '@libs/PolicyUtils'; +import {getMemberAccountIDsForWorkspace, isExpensifyTeam, shouldFilterExpensifyTeam} from '@libs/PolicyUtils'; import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper'; import MemberRightIcon from '@pages/workspace/MemberRightIcon'; @@ -52,8 +52,7 @@ function WorkspaceWorkflowsApprovalsOverLimitApproverPage({policy, personalDetai const currentApproverEmail = currentApprover?.email; - const canWriteApprovals = canMemberWrite(policy, currentUserLogin, CONST.POLICY.POLICY_FEATURE.WORKFLOWS_APPROVALS); - const shouldShowNotFoundView = !canWriteApprovals || isAnyHRReadOnlyWorkflowMode(policy); + const shouldShowNotFoundView = isAnyHRReadOnlyWorkflowMode(policy); const shouldFilterOutExpensifyTeam = shouldFilterExpensifyTeam(policy?.owner, currentUserLogin); const allApprovers: SelectionListApprover[] = (() => {