Skip to content

Use getCardSettings for nested paymentBankAccountID in card reconciliation#85290

Merged
carlosmiceli merged 3 commits intomainfrom
claude-fixNestedCardSettingsReconciliation
Mar 17, 2026
Merged

Use getCardSettings for nested paymentBankAccountID in card reconciliation#85290
carlosmiceli merged 3 commits intomainfrom
claude-fixNestedCardSettingsReconciliation

Conversation

@MelvinBot
Copy link
Contributor

Explanation of Change

When the backend sends Phase 2 nested card settings format (where paymentBankAccountID lives inside US, CURRENT, or GB sub-objects rather than at the root level), two things break:

  1. isExpensifyCardFullySetUp in CardUtils.ts checks cardSettings?.paymentBankAccountID at the root level only, returning false even when the card is fully set up — hiding the Card reconciliation option on the Accounting page.
  2. CardReconciliationPage.tsx reads paymentBankAccountID directly from the root of the card settings object, causing shouldShow to be false and rendering the "Hmm... it's not here" not-found page.

This PR updates both locations to use the existing getCardSettings() helper from CardUtils.ts, which correctly resolves paymentBankAccountID from nested sub-objects (Phase 2 format) while remaining backward-compatible with flat root-level settings.

Fixed Issues

$ #84740
PROPOSAL: #84740 (comment)

Tests

  1. Set up a workspace with Expensify Cards enabled, a verified VBA, and an assigned card
  2. Connect an accounting integration (Xero, QBO, NetSuite, or Sage Intacct)
  3. Navigate to the Accounting page
  4. Verify the Card reconciliation option row is displayed
  5. Click on the Card reconciliation option
  6. Verify the Card Reconciliation page loads correctly (no "Hmm... it's not here" error)
  7. Verify the correct bank account is shown and continuous reconciliation toggle works
  • Verify that no errors appear in the JS console

Offline tests

N/A — this change only affects how existing data is read from Onyx; no new network requests are added.

QA Steps

  1. As a workspace admin with Expensify Cards enabled and a fully verified VBA, connect an accounting integration (Xero, QBO, NetSuite, or Sage Intacct)
  2. Navigate to workspace Accounting page
  3. Verify the Card reconciliation option row is visible
  4. Tap on Card reconciliation
  5. Verify the page loads correctly and shows reconciliation settings
  • 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 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.

Screenshots/Videos

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

…conciliation

The isExpensifyCardFullySetUp function and CardReconciliationPage both
read paymentBankAccountID directly from the root level of card settings.
When the backend sends Phase 2 nested format (paymentBankAccountID inside
US/CURRENT/GB sub-objects), the root-level check fails, hiding the card
reconciliation option and showing "Hmm... it's not here" on the page.

Update isExpensifyCardFullySetUp to use getCardSettings() helper which
correctly resolves nested settings. Similarly update CardReconciliationPage
to use getCardSettings() when reading paymentBankAccountID.

Co-authored-by: Cong Pham <suneox@users.noreply.github.com>
@MelvinBot
Copy link
Contributor Author

I created this PR from an upstream branch since I don't have push access to your fork.

To take ownership of this branch and be able to push updates, run:

git remote add upstream https://github.com/Expensify/App.git
git fetch upstream claude-fixNestedCardSettingsReconciliation
git checkout -b claude-fixNestedCardSettingsReconciliation upstream/claude-fixNestedCardSettingsReconciliation
git push -u origin claude-fixNestedCardSettingsReconciliation

Then you can close this PR and open a new one from your fork.

@MelvinBot
Copy link
Contributor Author

The failing check is unrelated to this PR.

Analysis: The only failure is in test (job 8) — specifically tests/ui/SessionTest.tsx line 111, where the test "should not remember the report path of the last deep link login after signing out and in again" exceeds the 120-second timeout. This is a session/deep-linking test with no connection to the card settings/reconciliation changes in this PR.

Evidence: This PR only modifies src/libs/CardUtils.ts and src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx. The same SessionTest.tsx test is also failing on main with the identical timeout — confirming it is a pre-existing flaky test.

@suneox
Copy link
Contributor

suneox commented Mar 14, 2026

@MelvinBot The current PR is missing the implementation for the data-not-loaded case mentioned in the proposal.

When navigating directly to the Accounting page without first visiting
the Expensify Card page, PRIVATE_EXPENSIFY_CARD_SETTINGS may not be
loaded in Onyx. This adds a useEffect that calls
openPolicyExpensifyCardsPage to ensure card settings are fetched,
so shouldShowCardReconciliationOption evaluates correctly.

Co-authored-by: Cong Pham <suneox@users.noreply.github.com>
@MelvinBot
Copy link
Contributor Author

Added the missing data-not-loaded fix from the proposal.

What was missing: When a user navigates directly to the Accounting page without first visiting the Expensify Card page, PRIVATE_EXPENSIFY_CARD_SETTINGS may not be loaded in Onyx — causing shouldShowCardReconciliationOption to evaluate as false even when cards are fully set up.

What was added: A useEffect in PolicyAccountingPage that calls openPolicyExpensifyCardsPage(policyID, workspaceAccountID) when the component mounts and policy.areExpensifyCardsEnabled is true. This mirrors the pattern used in WorkspaceExpensifyCardPage and ensures card settings data is fetched so the reconciliation option appears correctly.

Changes in PolicyAccountingPage.tsx:

  • Imported useWorkspaceAccountID and openPolicyExpensifyCardsPage
  • Added useWorkspaceAccountID(policyID) hook call
  • Added useEffect that fetches card settings when cards are enabled

Co-authored-by: Cong Pham <suneox@users.noreply.github.com>
@MelvinBot
Copy link
Contributor Author

Fixed the failing Prettier check: moved the useWorkspaceAccountID import to its correct alphabetical position among the hook imports in PolicyAccountingPage.tsx.

@suneox
Copy link
Contributor

suneox commented Mar 14, 2026

@MelvinBot change PR status it ready for review

@MelvinBot
Copy link
Contributor Author

I'm unable to change the PR from draft to ready for review due to permission restrictions on this GitHub token. You can mark it as ready for review yourself by clicking "Ready for review" at the bottom of the PR page, or by running:

gh pr ready 85290 --repo Expensify/App

@suneox
Copy link
Contributor

suneox commented Mar 14, 2026

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 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
CleanShot.2026-03-14.at.14.22.54.mp4
Android: mWeb Chrome
CleanShot.2026-03-14.at.14.22.54.mp4
iOS: HybridApp
CleanShot.2026-03-14.at.13.50.51.mp4
iOS: mWeb Safari
CleanShot.2026-03-14.at.13.55.08.mp4
MacOS: Chrome / Safari
CleanShot.2026-03-14.at.13.47.54.mp4

@codecov
Copy link

codecov bot commented Mar 14, 2026

Codecov Report

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

Files with missing lines Coverage Δ
src/libs/CardUtils.ts 84.57% <100.00%> (ø)
...counting/reconciliation/CardReconciliationPage.tsx 0.00% <0.00%> (ø)
...ages/workspace/accounting/PolicyAccountingPage.tsx 0.00% <0.00%> (ø)
... and 13 files with indirect coverage changes

@suneox
Copy link
Contributor

suneox commented Mar 14, 2026

@MelvinBot ready for review

@MelvinBot MelvinBot marked this pull request as ready for review March 14, 2026 09:31
@MelvinBot MelvinBot requested a review from a team as a code owner March 14, 2026 09:31
@melvin-bot melvin-bot bot requested review from JmillsExpensify and suneox March 14, 2026 09:31
@melvin-bot
Copy link

melvin-bot bot commented Mar 14, 2026

@suneox 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 removed request for a team March 14, 2026 09:32
@MelvinBot
Copy link
Contributor Author

PR has been marked as ready for review.

@melvin-bot melvin-bot bot requested review from carlosmiceli and removed request for a team March 14, 2026 09:32
@melvin-bot
Copy link

melvin-bot bot commented Mar 14, 2026

@carlosmiceli 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]

Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 74929b2367

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment on lines +217 to +221
if (!policyID || !policy?.areExpensifyCardsEnabled || !workspaceAccountID) {
return;
}
openPolicyExpensifyCardsPage(policyID, workspaceAccountID);
}, [policyID, policy?.areExpensifyCardsEnabled, workspaceAccountID]);

Choose a reason for hiding this comment

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

P2 Badge Skip redundant card-settings reads on accounting page mount

This effect calls openPolicyExpensifyCardsPage on every mount whenever cards are enabled, but it never checks whether the workspace’s card settings have already been loaded (hasOnceLoaded). In practice, revisiting Accounting repeatedly will trigger unnecessary OPEN_POLICY_EXPENSIFY_CARDS_PAGE reads and extra Onyx loading merges for already-cached data, which adds avoidable network/backend load and state churn.

Useful? React with 👍 / 👎.

Copy link
Contributor

Choose a reason for hiding this comment

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

Expensify Cards can be updated from another platform, so we need to refetch to ensure we get the latest data instead of navigating to the Expensify Card page to fetch it.

Copy link
Contributor

@JmillsExpensify JmillsExpensify left a comment

Choose a reason for hiding this comment

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

Fix looks good for product.

@carlosmiceli carlosmiceli merged commit 8c98354 into main Mar 17, 2026
43 checks passed
@carlosmiceli carlosmiceli deleted the claude-fixNestedCardSettingsReconciliation branch March 17, 2026 17:50
@github-actions
Copy link
Contributor

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

@OSBotify
Copy link
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.

@OSBotify
Copy link
Contributor

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

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

@OSBotify
Copy link
Contributor

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

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.41-4 🚀

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.

5 participants