From 0d7a4447c7e34d12c3374a4ef8fd3c54e3836c64 Mon Sep 17 00:00:00 2001 From: Artem Makushov Date: Tue, 28 Jan 2025 02:55:57 +0700 Subject: [PATCH 1/2] update getAllCards function --- src/libs/CardUtils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts index 1d697af554f5..7665546bb98a 100644 --- a/src/libs/CardUtils.ts +++ b/src/libs/CardUtils.ts @@ -437,9 +437,9 @@ function checkIfNewFeedConnected(prevFeedsData: CompanyFeeds, currentFeedsData: }; } -function getAllCardsForWorkspace(workspaceAccountID: number): CardList { +function getAllCardsForWorkspace(workspaceAccountID: number, allCardList: OnyxCollection = allWorkspaceCards): CardList { const cards = {}; - for (const [key, values] of Object.entries(allWorkspaceCards ?? {})) { + for (const [key, values] of Object.entries(allCardList ?? {})) { if (key.includes(workspaceAccountID.toString()) && values) { const {cardList, ...rest} = values; Object.assign(cards, rest); From 73274546ad144251a754f839104a529c54f78d67 Mon Sep 17 00:00:00 2001 From: Artem Makushov Date: Tue, 28 Jan 2025 02:56:26 +0700 Subject: [PATCH 2/2] update shouldShowCardsSection and add cardList onyx to get updates in time --- src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx index 64d07fc337cc..15212133a316 100644 --- a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx +++ b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx @@ -62,6 +62,7 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM const StyleUtils = useStyleUtils(); const currentUserPersonalDetails = useCurrentUserPersonalDetails(); const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`); + const [cardList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}`); const [isRemoveMemberConfirmModalVisible, setIsRemoveMemberConfirmModalVisible] = useState(false); const [isRoleSelectionModalVisible, setIsRoleSelectionModalVisible] = useState(false); @@ -81,7 +82,7 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM const policyOwnerDisplayName = formatPhoneNumber(getDisplayNameOrDefault(ownerDetails)) ?? policy?.owner ?? ''; const hasMultipleFeeds = Object.values(getCompanyFeeds(cardFeeds)).filter((feed) => !feed.pending).length > 0; - const workspaceCards = getAllCardsForWorkspace(workspaceAccountID); + const workspaceCards = getAllCardsForWorkspace(workspaceAccountID, cardList); const hasWorkspaceCardsAssigned = !!workspaceCards && !!Object.values(workspaceCards).length; useEffect(() => { @@ -208,7 +209,7 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM return ; } - const shouldShowCardsSection = hasWorkspaceCardsAssigned && (!!policy?.areExpensifyCardsEnabled || !!policy?.areCompanyCardsEnabled); + const shouldShowCardsSection = (hasWorkspaceCardsAssigned || !!cardFeeds) && (!!policy?.areExpensifyCardsEnabled || !!policy?.areCompanyCardsEnabled); return (