@@ -63,7 +63,6 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
63
63
const StyleUtils = useStyleUtils ( ) ;
64
64
const currentUserPersonalDetails = useCurrentUserPersonalDetails ( ) ;
65
65
const [ cardFeeds ] = useOnyx ( `${ ONYXKEYS . COLLECTION . SHARED_NVP_PRIVATE_DOMAIN_MEMBER } ${ workspaceAccountID } ` ) ;
66
- const [ cardSettings ] = useOnyx ( `${ ONYXKEYS . COLLECTION . PRIVATE_EXPENSIFY_CARD_SETTINGS } ${ workspaceAccountID } ` ) ;
67
66
68
67
const [ isRemoveMemberConfirmModalVisible , setIsRemoveMemberConfirmModalVisible ] = useState ( false ) ;
69
68
const [ isRoleSelectionModalVisible , setIsRoleSelectionModalVisible ] = useState ( false ) ;
@@ -82,9 +81,9 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
82
81
const ownerDetails = personalDetails ?. [ policy ?. ownerAccountID ?? CONST . DEFAULT_NUMBER_ID ] ?? ( { } as PersonalDetails ) ;
83
82
const policyOwnerDisplayName = formatPhoneNumber ( PersonalDetailsUtils . getDisplayNameOrDefault ( ownerDetails ) ) ?? policy ?. owner ?? '' ;
84
83
const hasMultipleFeeds = Object . values ( CardUtils . getCompanyFeeds ( cardFeeds ) ) . filter ( ( feed ) => ! feed . pending ) . length > 0 ;
85
- const paymentAccountID = cardSettings ?. paymentBankAccountID ?? CONST . DEFAULT_NUMBER_ID ;
86
84
87
85
const workspaceCards = CardUtils . getAllCardsForWorkspace ( workspaceAccountID ) ;
86
+ const hasWorkspaceCardsAssigned = ! ! workspaceCards && ! ! Object . values ( workspaceCards ) . length ;
88
87
89
88
useEffect ( ( ) => {
90
89
CompanyCards . openPolicyCompanyCardsPage ( policyID , workspaceAccountID ) ;
@@ -209,7 +208,7 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
209
208
return < NotFoundPage /> ;
210
209
}
211
210
212
- const shouldShowCardsSection = ( ! ! policy ?. areExpensifyCardsEnabled && ! ! paymentAccountID ) || ( ! ! policy ?. areCompanyCardsEnabled && hasMultipleFeeds ) ;
211
+ const shouldShowCardsSection = hasWorkspaceCardsAssigned && ( ! ! policy ?. areExpensifyCardsEnabled || ! ! policy ?. areCompanyCardsEnabled ) ;
213
212
214
213
return (
215
214
< AccessOrNotFoundWrapper
0 commit comments