Skip to content

Commit e0120b5

Browse files
committed
fix: check if there are cards assigned to display cards section
1 parent 34bec4c commit e0120b5

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
6363
const StyleUtils = useStyleUtils();
6464
const currentUserPersonalDetails = useCurrentUserPersonalDetails();
6565
const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`);
66-
const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`);
6766

6867
const [isRemoveMemberConfirmModalVisible, setIsRemoveMemberConfirmModalVisible] = useState(false);
6968
const [isRoleSelectionModalVisible, setIsRoleSelectionModalVisible] = useState(false);
@@ -82,9 +81,9 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
8281
const ownerDetails = personalDetails?.[policy?.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID] ?? ({} as PersonalDetails);
8382
const policyOwnerDisplayName = formatPhoneNumber(PersonalDetailsUtils.getDisplayNameOrDefault(ownerDetails)) ?? policy?.owner ?? '';
8483
const hasMultipleFeeds = Object.values(CardUtils.getCompanyFeeds(cardFeeds)).filter((feed) => !feed.pending).length > 0;
85-
const paymentAccountID = cardSettings?.paymentBankAccountID ?? CONST.DEFAULT_NUMBER_ID;
8684

8785
const workspaceCards = CardUtils.getAllCardsForWorkspace(workspaceAccountID);
86+
const hasWorkspaceCardsAssigned = !!workspaceCards && !!Object.values(workspaceCards).length;
8887

8988
useEffect(() => {
9089
CompanyCards.openPolicyCompanyCardsPage(policyID, workspaceAccountID);
@@ -209,7 +208,7 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
209208
return <NotFoundPage />;
210209
}
211210

212-
const shouldShowCardsSection = (!!policy?.areExpensifyCardsEnabled && !!paymentAccountID) || (!!policy?.areCompanyCardsEnabled && hasMultipleFeeds);
211+
const shouldShowCardsSection = hasWorkspaceCardsAssigned && (!!policy?.areExpensifyCardsEnabled || !!policy?.areCompanyCardsEnabled);
213212

214213
return (
215214
<AccessOrNotFoundWrapper

0 commit comments

Comments
 (0)