From 72b511c3b70b4aa8cd1d65c11b3592187e20fff5 Mon Sep 17 00:00:00 2001 From: Artem Makushov Date: Wed, 6 Nov 2024 23:53:15 +0100 Subject: [PATCH 1/4] use full cardsList instead of user cardList --- .../companyCards/WorkspaceCompanyCardDetailsPage.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx index c5fc6e5e6eea..bc0cb127631e 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx @@ -52,9 +52,12 @@ function WorkspaceCompanyCardDetailsPage({route}: WorkspaceCompanyCardDetailsPag const connectedIntegration = getConnectedIntegration(policy, accountingIntegrations) ?? connectionSyncProgress?.connectionName; const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST); - const [allBankCards, allBankCardsMetadata] = useOnyx(`${ONYXKEYS.CARD_LIST}`); - const card = allBankCards?.[cardID]; + const [lastSelectedFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`); + const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`); + const selectedFeed = CardUtils.getSelectedFeed(lastSelectedFeed, cardFeeds); + const [cardsList, cardListMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${selectedFeed}`); + const card = cardsList?.[cardID]; const cardBank = card?.bank ?? ''; const cardholder = personalDetails?.[card?.accountID ?? -1]; const displayName = PersonalDetailsUtils.getDisplayNameOrDefault(cardholder); @@ -70,7 +73,7 @@ function WorkspaceCompanyCardDetailsPage({route}: WorkspaceCompanyCardDetailsPag CompanyCards.updateWorkspaceCompanyCard(workspaceAccountID, cardID, bank); }; - if (!card && !isLoadingOnyxValue(allBankCardsMetadata)) { + if (!card && !isLoadingOnyxValue(cardListMetadata)) { return ; } From 5f3a4c7587e5eeacf2cfa28ede93efdba3b1d005 Mon Sep 17 00:00:00 2001 From: Artem Makushov Date: Thu, 7 Nov 2024 13:40:24 +0100 Subject: [PATCH 2/4] use bankCards --- .../companyCards/WorkspaceCompanyCardDetailsPage.tsx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx index bc0cb127631e..376744affae6 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx @@ -52,12 +52,9 @@ function WorkspaceCompanyCardDetailsPage({route}: WorkspaceCompanyCardDetailsPag const connectedIntegration = getConnectedIntegration(policy, accountingIntegrations) ?? connectionSyncProgress?.connectionName; const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST); - const [lastSelectedFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`); - const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`); - const selectedFeed = CardUtils.getSelectedFeed(lastSelectedFeed, cardFeeds); - const [cardsList, cardListMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${selectedFeed}`); + const [allBankCards, allBankCardsMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${bank}`); + const card = allBankCards?.[cardID]; - const card = cardsList?.[cardID]; const cardBank = card?.bank ?? ''; const cardholder = personalDetails?.[card?.accountID ?? -1]; const displayName = PersonalDetailsUtils.getDisplayNameOrDefault(cardholder); @@ -73,7 +70,7 @@ function WorkspaceCompanyCardDetailsPage({route}: WorkspaceCompanyCardDetailsPag CompanyCards.updateWorkspaceCompanyCard(workspaceAccountID, cardID, bank); }; - if (!card && !isLoadingOnyxValue(cardListMetadata)) { + if (!card && !isLoadingOnyxValue(allBankCardsMetadata)) { return ; } From c271649a2c66bba14bcbc92b60482f67bcbf661f Mon Sep 17 00:00:00 2001 From: Artem Makushov Date: Thu, 7 Nov 2024 14:22:43 +0100 Subject: [PATCH 3/4] add verification for bank --- .../companyCards/WorkspaceCompanyCardDetailsPage.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx index 376744affae6..e513b3e526d8 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx @@ -70,7 +70,10 @@ function WorkspaceCompanyCardDetailsPage({route}: WorkspaceCompanyCardDetailsPag CompanyCards.updateWorkspaceCompanyCard(workspaceAccountID, cardID, bank); }; - if (!card && !isLoadingOnyxValue(allBankCardsMetadata)) { + const allBanks = Object.values(CONST.COMPANY_CARD.FEED_BANK_NAME) as string[]; + const isBankMatchesFeed = allBanks.includes(bank); + + if (!card && !isLoadingOnyxValue(allBankCardsMetadata) && !isBankMatchesFeed) { return ; } From 397cb8dda873614a732755ef96c67acd2ab8cbaf Mon Sep 17 00:00:00 2001 From: Artem Makushov Date: Thu, 7 Nov 2024 18:27:22 +0100 Subject: [PATCH 4/4] revert reduntant check --- .../companyCards/WorkspaceCompanyCardDetailsPage.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx index e513b3e526d8..376744affae6 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx @@ -70,10 +70,7 @@ function WorkspaceCompanyCardDetailsPage({route}: WorkspaceCompanyCardDetailsPag CompanyCards.updateWorkspaceCompanyCard(workspaceAccountID, cardID, bank); }; - const allBanks = Object.values(CONST.COMPANY_CARD.FEED_BANK_NAME) as string[]; - const isBankMatchesFeed = allBanks.includes(bank); - - if (!card && !isLoadingOnyxValue(allBankCardsMetadata) && !isBankMatchesFeed) { + if (!card && !isLoadingOnyxValue(allBankCardsMetadata)) { return ; }