Skip to content

Remove useOnyx loading status reads from company card and Expensify card pages - #106824

Merged
mountiny merged 2 commits into
Expensify:mainfrom
callstack-internal:VickyStash/refactor/104583-workspace-onyx-status-pt5
Nov 16, 2026
Merged

mountiny merged 2 commits into
Expensify:mainfrom
callstack-internal:VickyStash/refactor/104583-workspace-onyx-status-pt5

Conversation

@VickyStash

@VickyStash VickyStash commented Nov 13, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

This continues the Workspace cleanup from #106374. This part covers the company cards and Expensify card pages.

Once the app has started, useOnyx only returns loading when a key has nothing in the cache yet and an Onyx.merge for it hasn't been applied. None of these pages can run into that:

  • The add-feed and assign-card flows start with an Onyx.set (clearAddNewCardFlow, clearAssignCardStepAndData), which updates the cache right away. Later merges land on a key that's already cached. The imported spreadsheet is also written with Onyx.set before the columns page opens.
  • The card details, card name and bulk start date pages read card lists and custom card names that the cards table or the card details page already loaded.
  • The feed name and statement close date pages read the last selected feed. They're only opened from the company cards settings page, which already reads it, so no merge for it is pending.
  • WorkspaceCompanyCardsPage only used the status to hold back the feed fetch. Nothing writes the cards list optimistically, so the check never fired.
    • The spend rule selection page is only opened from the issue card flow, so its data is already in Onyx. After a refresh the data is gone and the page goes back to the start of the flow, same as before.
  • Card feeds are a collection key, which is never loading after startup.

So I removed the loading checks, the metadata variables, and the loaders that only rendered while loading. The lastSelectedFeed read in WorkspaceCompanyCardsTable and useCompanyCards, which is a real loading case when switching feeds, is left for the components and hooks batches.

Fixed Issues

$ #104583
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

Use a Control workspace with a company card feed that has a few cards.

  1. Go to Workspace > Company cards. Verify the cards load, and that switching to another feed shows its cards.
  2. Open a card. Verify the details page shows. Press Card name, change the name, save, and verify the new name is shown.
  3. Unassign a card from its details page. Verify you're sent back to the list without the not-found page flashing.
  4. Select a few cards, choose Transaction start date from the bulk actions menu, pick a date and save. Verify the dates are updated.
  5. Open Settings for the feed. Change the feed name and verify it's saved. Change the statement close date and verify it's saved.
  6. Press Assign on an unassigned card, pick a member and continue to the transaction start date step. Verify the options show, pick a custom date, continue and assign the card.
  7. Add a new feed. Verify the country step shows and that you can move through the next steps.
  8. Add a feed with "Import transactions from file" and upload a CSV. Verify the columns page opens with the columns mapped, then import. Open Settings for that feed, press Import spreadsheet and upload the CSV again. Verify the columns are mapped the same way as before.
  9. Go to Workspace > Expensify card and start issuing a new card. On the spend rules step choose to copy an existing rule, pick one and verify it's selected.

Offline tests

Same, as in Tests section

QA Steps

Same, as in Tests section

  • 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 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 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)
  • 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)
  • 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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.mp4
iOS: Native
ios.mov
MacOS: Chrome / Safari
web_01.mp4
web2.mp4

@codecov

codecov Bot commented Nov 13, 2026 •

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
...rkspace/companyCards/WorkspaceCompanyCardsPage.tsx 95.45% <100.00%> (-0.06%) ⬇️
...e/companyCards/addNew/CompanyCardsImportedPage.tsx 66.66% <100.00%> (+0.52%) ⬆️
...rds/WorkspaceCompanyCardStatementCloseDatePage.tsx 0.00% <0.00%> (ø)
...ards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx 0.00% <0.00%> (ø)
...pace/companyCards/addNew/DynamicAddNewCardPage.tsx 0.00% <0.00%> (ø)
...nyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx 0.00% <0.00%> (ø)
...panyCards/WorkspaceCompanyCardEditCardNamePage.tsx 0.00% <0.00%> (ø)
...ard/issueNew/spendRules/SpendRuleSelectionPage.tsx 0.00% <0.00%> (ø)
...ceCompanyCardsBulkEditTransactionStartDatePage.tsx 0.00% <0.00%> (ø)
...mpanyCards/assignCard/TransactionStartDateStep.tsx 0.00% <0.00%> (ø)
... and 8 files with indirect coverage changes

@VickyStash
VickyStash marked this pull request as ready for review November 13, 2026 15:26
@VickyStash
VickyStash requested review from a team as code owners November 13, 2026 15:26
@melvin-bot
melvin-bot Bot requested review from JmillsExpensify and nkdengineer and removed request for a team November 13, 2026 15:26
@melvin-bot

melvin-bot Bot commented Nov 13, 2026

Copy link
Copy Markdown

@nkdengineer 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 removed the request for review from a team November 13, 2026 15:27
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 13, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-13T15:47:39.043737Z a6ace11 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@JmillsExpensify JmillsExpensify 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.

No product review required.

@roryabraham roryabraham 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.

Nice simplification!

@nkdengineer

nkdengineer commented Nov 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 proper code patterns were followed (see Reviewing the code)
    • 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 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)
  • 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)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • 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
    • 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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-11-15.at.23.16.34.mov
Android: mWeb Chrome
Screen.Recording.2026-11-15.at.23.10.49.mov
iOS: HybridApp
Screen.Recording.2026-11-15.at.23.15.28.mov
iOS: mWeb Safari
Screen.Recording.2026-11-15.at.23.12.45.mov
MacOS: Chrome / Safari
Screen.Recording.2026-11-15.at.23.05.26.mov

@nkdengineer nkdengineer 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 requested a review from mountiny November 15, 2026 16:20

@mountiny mountiny 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.

Thank you!

@mountiny
mountiny merged commit e427bdf into Expensify:main Nov 16, 2026
47 of 57 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@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.

@github-actions

Copy link
Copy Markdown
Contributor

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.

7 participants