From 8d0e1bc02e53c5db370c7a86a00a85e5aa4d4d14 Mon Sep 17 00:00:00 2001 From: Jairo Calmon Date: Thu, 26 Mar 2026 12:27:47 -0300 Subject: [PATCH 1/4] Allow finishing adding existing personal cards --- .../PersonalCards/useGetNewPersonalCard.ts | 17 +++++++++-------- src/types/onyx/Card.ts | 3 +++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/pages/settings/Wallet/PersonalCards/useGetNewPersonalCard.ts b/src/pages/settings/Wallet/PersonalCards/useGetNewPersonalCard.ts index bc7dad042f6c..7280abba8bdb 100644 --- a/src/pages/settings/Wallet/PersonalCards/useGetNewPersonalCard.ts +++ b/src/pages/settings/Wallet/PersonalCards/useGetNewPersonalCard.ts @@ -17,14 +17,15 @@ export default function useGetNewPersonalCard() { prevCardListRef.current = cardList; return; } - const prevCardList = prevCardListRef.current; - const prevIds = new Set(Object.keys(prevCardList)); - const currentIds = Object.keys(cardList); - const newCardIds = currentIds.filter((id) => !prevIds.has(id)); - if (newCardIds.length > 0) { - for (const id of newCardIds) { - setNewCard(cardList[id]); - } + + // Find the first card that is either new or has a fresh import timestamp + const latestChange = Object.values(cardList).find(card => { + const prev = prevCardListRef.current?.[card.cardID]; + return !prev || card.lastImportAttempt !== prev.lastImportAttempt; + }); + + if (latestChange) { + setNewCard(latestChange); } prevCardListRef.current = cardList; diff --git a/src/types/onyx/Card.ts b/src/types/onyx/Card.ts index 57cec8f15510..ad421678c53f 100644 --- a/src/types/onyx/Card.ts +++ b/src/types/onyx/Card.ts @@ -105,6 +105,9 @@ type Card = OnyxCommon.OnyxValueWithOfflineFeedback<{ /** Last update result */ lastScrapeResult?: number; + /** Last import attempt */ + lastImportAttempt?: string; + /** Card related error messages */ errors?: OnyxCommon.Errors; From 7660c76afa35f28c07cc7f84ec62c467c1db8748 Mon Sep 17 00:00:00 2001 From: Jairo Calmon Date: Thu, 26 Mar 2026 13:26:12 -0300 Subject: [PATCH 2/4] Adjust search for plaid connected feeds --- src/libs/CardUtils.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts index fe897595e1b9..ad5cba281f0c 100644 --- a/src/libs/CardUtils.ts +++ b/src/libs/CardUtils.ts @@ -971,8 +971,12 @@ function checkIfNewFeedConnected(prevFeedsData: CompanyFeeds, currentFeedsData: const prevFeeds = Object.keys(prevFeedsData); const currentFeeds = Object.keys(currentFeedsData); + const plaidBankFound = plaidBank && (currentFeeds.includes(`${CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID}.${plaidBank}`) || currentFeeds.find(feed => { + return splitCardFeedWithDomainID(feed as CompanyCardFeedWithDomainID)?.feedName === `${CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID}.${plaidBank}`; + })); + return { - isNewFeedConnected: currentFeeds.length > prevFeeds.length || (plaidBank && currentFeeds.includes(`${CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID}.${plaidBank}`)), + isNewFeedConnected: currentFeeds.length > prevFeeds.length || plaidBankFound, newFeed: currentFeeds.find((feed) => !prevFeeds.includes(feed)) as CompanyCardFeedWithDomainID | undefined, }; } From 7b45a0d066d24380e397d6169854bc9241f55b31 Mon Sep 17 00:00:00 2001 From: Jairo Calmon Date: Thu, 26 Mar 2026 16:10:02 -0300 Subject: [PATCH 3/4] Lint code --- src/libs/CardUtils.ts | 9 ++++++--- .../Wallet/PersonalCards/useGetNewPersonalCard.ts | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts index ad5cba281f0c..6791042c618c 100644 --- a/src/libs/CardUtils.ts +++ b/src/libs/CardUtils.ts @@ -971,9 +971,12 @@ function checkIfNewFeedConnected(prevFeedsData: CompanyFeeds, currentFeedsData: const prevFeeds = Object.keys(prevFeedsData); const currentFeeds = Object.keys(currentFeedsData); - const plaidBankFound = plaidBank && (currentFeeds.includes(`${CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID}.${plaidBank}`) || currentFeeds.find(feed => { - return splitCardFeedWithDomainID(feed as CompanyCardFeedWithDomainID)?.feedName === `${CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID}.${plaidBank}`; - })); + const plaidBankFound = + plaidBank && + (currentFeeds.includes(`${CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID}.${plaidBank}`) || + currentFeeds.find((feed) => { + return splitCardFeedWithDomainID(feed as CompanyCardFeedWithDomainID)?.feedName === `${CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID}.${plaidBank}`; + })); return { isNewFeedConnected: currentFeeds.length > prevFeeds.length || plaidBankFound, diff --git a/src/pages/settings/Wallet/PersonalCards/useGetNewPersonalCard.ts b/src/pages/settings/Wallet/PersonalCards/useGetNewPersonalCard.ts index 7280abba8bdb..10af93322ecb 100644 --- a/src/pages/settings/Wallet/PersonalCards/useGetNewPersonalCard.ts +++ b/src/pages/settings/Wallet/PersonalCards/useGetNewPersonalCard.ts @@ -19,7 +19,7 @@ export default function useGetNewPersonalCard() { } // Find the first card that is either new or has a fresh import timestamp - const latestChange = Object.values(cardList).find(card => { + const latestChange = Object.values(cardList).find((card) => { const prev = prevCardListRef.current?.[card.cardID]; return !prev || card.lastImportAttempt !== prev.lastImportAttempt; }); From 55c377bebce1f59ba3847a4f2f52f001d4000bad Mon Sep 17 00:00:00 2001 From: Jairo Calmon Date: Fri, 3 Apr 2026 17:05:05 -0300 Subject: [PATCH 4/4] Adjust signature and remove unneded check --- src/libs/CardUtils.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts index 40f3554bc255..2f82b763a68c 100644 --- a/src/libs/CardUtils.ts +++ b/src/libs/CardUtils.ts @@ -968,16 +968,15 @@ function getCardAssignmentStartDate(isEditing: boolean | undefined, existingStar return isEditing ? (existingStartDate ?? format(new Date(), CONST.DATE.FNS_FORMAT_STRING)) : format(new Date(), CONST.DATE.FNS_FORMAT_STRING); } -function checkIfNewFeedConnected(prevFeedsData: CompanyFeeds, currentFeedsData: CompanyFeeds, plaidBank?: string) { +function checkIfNewFeedConnected(prevFeedsData: CombinedCardFeeds, currentFeedsData: CombinedCardFeeds, plaidBank?: string) { const prevFeeds = Object.keys(prevFeedsData); const currentFeeds = Object.keys(currentFeedsData); const plaidBankFound = plaidBank && - (currentFeeds.includes(`${CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID}.${plaidBank}`) || - currentFeeds.find((feed) => { - return splitCardFeedWithDomainID(feed as CompanyCardFeedWithDomainID)?.feedName === `${CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID}.${plaidBank}`; - })); + currentFeeds.find((feed) => { + return splitCardFeedWithDomainID(feed as CompanyCardFeedWithDomainID)?.feedName === `${CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID}.${plaidBank}`; + }); return { isNewFeedConnected: currentFeeds.length > prevFeeds.length || plaidBankFound,