@@ -10,14 +10,14 @@ import SearchBar from '@components/SearchBar';
1010import Text from '@components/Text' ;
1111import TextLink from '@components/TextLink' ;
1212
13+ import useApprovalWorkflows from '@hooks/useApprovalWorkflows' ;
1314import useConfirmModal from '@hooks/useConfirmModal' ;
1415import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails' ;
1516import useDebouncedAccessibilityAnnouncement from '@hooks/useDebouncedAccessibilityAnnouncement' ;
1617import { useMemoizedLazyExpensifyIcons } from '@hooks/useLazyAsset' ;
1718import useLocalize from '@hooks/useLocalize' ;
1819import useOnyx from '@hooks/useOnyx' ;
1920import usePermissions from '@hooks/usePermissions' ;
20- import { useAllPersonalDetails } from '@hooks/usePersonalDetails' ;
2121import usePolicy from '@hooks/usePolicy' ;
2222import usePolicyFeatureWriteAccess from '@hooks/usePolicyFeatureWriteAccess' ;
2323import useResponsiveLayout from '@hooks/useResponsiveLayout' ;
@@ -35,23 +35,12 @@ import Navigation from '@libs/Navigation/Navigation';
3535import { isTrackOnboardingChoice } from '@libs/OnboardingUtils' ;
3636import { getApprovalWorkflow , hasDynamicExternalWorkflow , isControlPolicy , isGroupPolicy , isSubmitPolicy , shouldHideDynamicExternalWorkflowPeople } from '@libs/PolicyUtils' ;
3737import tokenizedSearch from '@libs/tokenizedSearch' ;
38- import {
39- convertApprovalWorkflowRulesToWorkflows ,
40- convertPolicyEmployeesToApprovalWorkflows ,
41- filterRulesForPolicy ,
42- getApprovalWorkflowRulesForPolicy ,
43- getApprovalWorkflowSource ,
44- INITIAL_APPROVAL_WORKFLOW ,
45- isApprovalWorkflowLockedByIntegration ,
46- } from '@libs/WorkflowUtils' ;
38+ import { getApprovalWorkflowSource , INITIAL_APPROVAL_WORKFLOW , isApprovalWorkflowLockedByIntegration } from '@libs/WorkflowUtils' ;
4739
4840import CONST from '@src/CONST' ;
4941import ONYXKEYS from '@src/ONYXKEYS' ;
5042import ROUTES , { DYNAMIC_ROUTES } from '@src/ROUTES' ;
5143import type ApprovalWorkflow from '@src/types/onyx/ApprovalWorkflow' ;
52- import type Rule from '@src/types/onyx/Rule' ;
53-
54- import type { OnyxCollection } from 'react-native-onyx' ;
5544
5645import { Str } from 'expensify-common' ;
5746import React , { useCallback , useEffect , useMemo , useState } from 'react' ;
@@ -116,23 +105,22 @@ function WorkflowsLoadMoreCard({count, onPress}: {count: number; onPress: () =>
116105}
117106
118107function WorkflowsApprovalsTab ( { policyID} : WorkflowsApprovalsTabProps ) {
119- const { translate, localeCompare , formatPhoneNumber} = useLocalize ( ) ;
108+ const { translate, formatPhoneNumber} = useLocalize ( ) ;
120109 const styles = useThemeStyles ( ) ;
121110 const theme = useTheme ( ) ;
122111 const { shouldUseNarrowLayout} = useResponsiveLayout ( ) ;
123112 const expensifyIcons = useMemoizedLazyExpensifyIcons ( [ 'Info' , 'Plus' ] ) ;
124113 const policy = usePolicy ( policyID ) ;
125114 const { showConfirmModal} = useConfirmModal ( ) ;
126- const { isBetaEnabled , isBetaEnabledOrUnknown} = usePermissions ( ) ;
115+ const { isBetaEnabledOrUnknown} = usePermissions ( ) ;
127116
128117 const isSmartLimitEnabled = policy ?. areApprovalsLockedByExpensifyCard ?? false ;
129118 const [ transactionViolations ] = useOnyx ( ONYXKEYS . COLLECTION . TRANSACTION_VIOLATIONS ) ;
130- const [ personalDetails ] = useAllPersonalDetails ( ) ;
131119 const [ account ] = useOnyx ( ONYXKEYS . ACCOUNT ) ;
132120 const [ introSelected ] = useOnyx ( ONYXKEYS . NVP_INTRO_SELECTED ) ;
133121 const accountManagerReportID = account ?. accountManagerReportID ;
134122 const isTrackIntentUser = isTrackOnboardingChoice ( introSelected ?. choice ) ;
135- const { accountID : currentUserAccountID , email : currentUserEmail = '' , login : currentUserLogin = '' } = useCurrentUserPersonalDetails ( ) ;
123+ const { accountID : currentUserAccountID , email : currentUserEmail = '' } = useCurrentUserPersonalDetails ( ) ;
136124
137125 const {
138126 canWrite : canWriteApprovals ,
@@ -142,21 +130,8 @@ function WorkflowsApprovalsTab({policyID}: WorkflowsApprovalsTabProps) {
142130
143131 const isSubmitPolicyWorkspace = isSubmitPolicy ( policy ) ;
144132
145- const isMultipleApproversBetaEnabled = isBetaEnabled ( CONST . BETAS . MULTIPLE_APPROVERS ) ;
146- const policyRulesSelector = useCallback ( ( rules : OnyxCollection < Rule > ) => filterRulesForPolicy ( rules , policyID ) , [ policyID ] ) ;
147- const [ rulesCollection ] = useOnyx ( ONYXKEYS . COLLECTION . RULE , { selector : policyRulesSelector } ) ;
148- const { approvalWorkflows, availableMembers, usedApproverEmails} = useMemo ( ( ) => {
149- const params = {
150- policy,
151- personalDetails : personalDetails ?? { } ,
152- localeCompare,
153- currentUserLogin,
154- rules : getApprovalWorkflowRulesForPolicy ( rulesCollection , policyID ) ,
155- } ;
156- return isMultipleApproversBetaEnabled ? convertApprovalWorkflowRulesToWorkflows ( params ) : convertPolicyEmployeesToApprovalWorkflows ( params ) ;
157- } , [ policy , personalDetails , localeCompare , currentUserLogin , rulesCollection , policyID , isMultipleApproversBetaEnabled ] ) ;
133+ const { approvalWorkflows, filteredApprovalWorkflows, availableMembers, usedApproverEmails, isAdvanceApproval, rulesCollection, personalDetails} = useApprovalWorkflows ( policy ) ;
158134
159- const isAdvanceApproval = ( approvalWorkflows . length > 1 || ( approvalWorkflows ?. at ( 0 ) ?. approvers ?? [ ] ) . length > 1 ) && isControlPolicy ( policy ) ;
160135 const updateApprovalMode = isAdvanceApproval ? CONST . POLICY . APPROVAL_MODE . ADVANCED : CONST . POLICY . APPROVAL_MODE . BASIC ;
161136
162137 const confirmDisableApprovals = useCallback ( ( ) => {
@@ -231,14 +206,6 @@ function WorkflowsApprovalsTab({policyID}: WorkflowsApprovalsTabProps) {
231206 const isRecruitingAdvancedModeEnabled = isRecruitingAdvancedMode ( policy ) ;
232207 const hrFinalApproverEmail = getHRFinalApprover ( policy ) ;
233208
234- const filteredApprovalWorkflows =
235- isMultipleApproversBetaEnabled ||
236- policy ?. approvalMode === CONST . POLICY . APPROVAL_MODE . ADVANCED ||
237- policy ?. approvalMode === CONST . POLICY . APPROVAL_MODE . DYNAMICEXTERNAL ||
238- isHRAdvancedModeEnabled
239- ? approvalWorkflows
240- : approvalWorkflows . filter ( ( workflow ) => workflow . isDefault ) ;
241-
242209 const everyoneText = translate ( 'workspace.common.everyone' ) ;
243210
244211 const filterWorkflow = ( workflow : ApprovalWorkflow , searchInput : string ) => {
0 commit comments