Skip to content

Enhance card mapping to include assigned cards for OAuth feeds - #82179

Merged
carlosmiceli merged 4 commits into
Expensify:mainfrom
fedirjh:fix-duplicate-cards-OAuth-feeds
Feb 13, 2026
Merged

carlosmiceli merged 4 commits into
Expensify:mainfrom
fedirjh:fix-duplicate-cards-OAuth-feeds

Conversation

@fedirjh

@fedirjh fedirjh commented Feb 11, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/599155
PROPOSAL:

Tests

  • Set up Amex feed in new Dot

  • Assign all the cards within the feed

  • Open the Amex feed dashboard and update the card list

  • Fetch the feed again in newDot and verify the assigned cards are displayed correctly, and you get new unassigned cards as well

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
Screenshot 2026-02-11 at 10 02 04 PM

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@github-actions

Copy link
Copy Markdown
Contributor

🚧 @trjExpensify has triggered a test Expensify/App build. You can view the workflow run here.

@codecov

codecov Bot commented Feb 11, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/hooks/useCompanyCards.ts 100.00% <100.00%> (ø)
src/libs/CardUtils.ts 75.27% <100.00%> (+0.05%) ⬆️
.../companyCards/WorkspaceCompanyCardsTable/index.tsx 0.00% <0.00%> (ø)
... and 151 files with indirect coverage changes

@github-actions

This comment has been minimized.

@fedirjh
fedirjh marked this pull request as ready for review February 11, 2026 21:51
@fedirjh
fedirjh requested review from a team as code owners February 11, 2026 21:51
@melvin-bot
melvin-bot Bot requested review from hungvu193 and joekaufmanexpensify and removed request for a team February 11, 2026 21:51
@melvin-bot

melvin-bot Bot commented Feb 11, 2026

Copy link
Copy Markdown

@hungvu193 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot
melvin-bot Bot requested review from a team and QichenZhu and removed request for a team February 11, 2026 21:51
@melvin-bot

melvin-bot Bot commented Feb 11, 2026

Copy link
Copy Markdown

@QichenZhu Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

Comment thread src/hooks/useCompanyCards.ts Resolved
@carlosmiceli

Copy link
Copy Markdown
Contributor

@MelvinBot could you please review this PR?

@carlosmiceli

Copy link
Copy Markdown
Contributor

@fedirjh I think it'd be good to have a video example in this PR's description (web and mobile), what do you think?

@MelvinBot

Copy link
Copy Markdown
Contributor

🔍 PR Review

Summary: This PR adds a defensive fallback in useCompanyCards to ensure assigned cards appear in cardNamesToEncryptedCardNumberMapping even when cardList or accountList is stale/incomplete. It also adds comprehensive unit tests covering this new behavior.

Code Changes

src/hooks/useCompanyCards.ts — The new loop (lines 68-81) runs after the existing mapping is built from accountList (Phase 1) and cardList (Phase 2). For each assigned card:

  1. Skips cards without a cardName (correct — both cardName and encryptedCardNumber are optional on the Card type)
  2. Uses isMatchingCard to check if the card is already represented (handles both exact encryptedCardNumber match and normalized cardName comparison)
  3. Adds missing cards with card.encryptedCardNumber ?? card.cardName as the value (consistent with how accountList entries use cardName as both key and value)

tests/unit/hooks/useCompanyCards.test.ts — 8 new test cases covering:

  • Empty/stale cardList for custom feeds
  • Cards missing from OAuth accountList
  • De-duplication by encryptedCardNumber
  • De-duplication by cardName match
  • Multiple missing assigned cards
  • Cards without cardName are skipped
  • Fallback when encryptedCardNumber is missing
  • Normalized matching with special characters (® symbol)

Assessment

Correctness: The approach is sound. The cardNamesToEncryptedCardNumberMapping drives the table in WorkspaceCompanyCardsTable (line 151-169 of index.tsx), which uses isMatchingCard the same way to find the associated Card object. Without this fix, assigned cards missing from cardList/accountList would be invisible in the UI.

No mutation/race concerns: The mapping object is created fresh each render (line 59) and all modifications happen synchronously before it's returned. The useCardsList hook already applies filterInactiveCards, so closed/deactivated/suspended cards won't leak through.

Complexity: The loop is O(assignedCards × mappingEntries) due to .some(). For typical workspace card counts (dozens to low hundreds), this is negligible. Not a concern in practice.

Test quality: Comprehensive and well-structured. The tests cover the important edge cases including normalization behavior with special characters.

Minor Observations

  1. Import addition is clean — isMatchingCard was already exported from CardUtils.ts and is the right utility for this purpose.

  2. One edge case to be aware of (not a blocker): If two different assigned cards share the same cardName but have different encryptedCardNumber values, only the first one iterated would appear in the mapping. This is a pre-existing architectural constraint (the mapping is keyed by card name), not introduced by this PR.

Overall this looks good to me. The change is minimal, defensive, and well-tested.

@carlosmiceli

Copy link
Copy Markdown
Contributor

If two different assigned cards share the same cardName but have different encryptedCardNumber values, only the first one iterated would appear in the mapping.

@fedirjh seems like this is something we could also fix, what do you think?

Comment thread src/hooks/useCompanyCards.ts Resolved

@joekaufmanexpensify joekaufmanexpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good from product

@fedirjh

fedirjh commented Feb 12, 2026

Copy link
Copy Markdown
Contributor Author

@carlosmiceli @hungvu193 Ready for another review.

I think it'd be good to have a video example in this PR's description (web and mobile), what do you think?

Yep, but reproducing the behaviour (accountList updated while all cards are already assigned) is quite challenging.

@trjExpensify
trjExpensify removed their request for review February 12, 2026 23:58
@trjExpensify

Copy link
Copy Markdown
Contributor

Joe took the product review.

@hungvu193

hungvu193 commented Feb 13, 2026 •

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Screen.Recording.2026-02-13.at.10.47.40.mov
Android: mWeb Chrome
Screen.Recording.2026-02-13.at.10.51.58.mov
iOS: HybridApp
Screen.Recording.2026-02-13.at.10.41.47.mov
iOS: mWeb Safari
Screen.Recording.2026-02-13.at.10.42.29.mov
MacOS: Chrome / Safari
Screen.Recording.2026-02-13.at.10.32.27.mov

@hungvu193 hungvu193 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@melvin-bot

melvin-bot Bot commented Feb 13, 2026

Copy link
Copy Markdown

🎯 @hungvu193, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #82349.

@carlosmiceli
carlosmiceli merged commit eaedae9 into Expensify:main Feb 13, 2026
30 of 33 checks passed
@OSBotify

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@fedirjh
fedirjh deleted the fix-duplicate-cards-OAuth-feeds branch February 13, 2026 15:45
@github-actions

Copy link
Copy Markdown
Contributor

🚧 @carlosmiceli has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify OSBotify mentioned this pull request Feb 13, 2026
69 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.3.19-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@izarutskaya

Copy link
Copy Markdown

Hi @fedirjh Could you please share steps for QA team?

@fedirjh

fedirjh commented Feb 13, 2026

Copy link
Copy Markdown
Contributor Author

Could you please share steps for QA team?

@izarutskaya Here is it, the steps in chrome

  1. Have a workspace with a direct feed
  2. Navigate to the workspace cards page
  3. Assign all the cards in the feed
  4. Open the chrome devtools and run this code
// Auto-detect and add test card
const c1 = Onyx.connect({
    key: 'policy_',
    waitForCollectionCallback: true,
    callback: (policies) => {
        Onyx.disconnect(c1);
        const policy = Object.values(policies || {}).find(p => p?.areCompanyCardsEnabled);
        if (!policy) { console.log('❌ No policy with cards'); return; }

        const wsID = policy.workspaceAccountID;
        const domainKey = `sharedNVP_private_domain_member_${wsID}`;

        const c2 = Onyx.connect({
            key: domainKey,
            callback: (domain) => {
                Onyx.disconnect(c2);
                if (!domain) { console.log('❌ No domain data'); return; }

                const oAuthDetails = domain?.settings?.oAuthAccountDetails || {};
                const [feed, details] = Object.entries(oAuthDetails).find(([_, d]) => d?.accountList?.length) || [];
                if (!feed) { console.log('❌ No OAuth feed found'); return; }

                const list = details.accountList;
                console.log('Feed:', feed, '| Current cards:', list.length);

                Onyx.merge(domainKey, {
                    settings: { oAuthAccountDetails: { [feed]: { accountList: [...list, `Test Card - ${Date.now()}`] }}}
                });
                console.log('✅ Added test card. Check the page to verify.');
            }
        });
    }
});
  1. Verify a new unassigned card is displayed for the user
  2. Verify all assigned cards from step 3 are displayed as well

CleanShot.2026-02-13.at.22.15.50.mp4

@izarutskaya

Copy link
Copy Markdown

@fedirjh We need to check only Web, right?

@fedirjh

fedirjh commented Feb 14, 2026

Copy link
Copy Markdown
Contributor Author

@izarutskaya yes

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.3.19-5 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants