Skip to content

Remove useOnyx loading status reads from workspace member and approval pages - #106374

Merged
mountiny merged 6 commits into
Expensify:mainfrom
callstack-internal:VickyStash/refactor/104583-workspace-onyx-status-pt3
Nov 10, 2026
Merged

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

Conversation

@VickyStash

@VickyStash VickyStash commented Nov 9, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

This continues the Workspace cleanup from #105937. This part covers the invite, member and approval workflow 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 invite pages read the invite drafts (members, message, role). These drafts are only ever written with Onyx.set, which updates the cache right away, so they're never loading.
  • The bulk edit pages (office location, work arrangement) and the role page read the member selection. It lives in memory only and is also written with Onyx.set.
  • The approval workflow pages read approvalWorkflow. It's merged only by actions on these same pages. Even when a merge lands on an empty value, the check only covered one render, and in that render the hook already returns undefined.
  • The invite page and the member display name page read the workspace and the member's personal details. Both are already in the cache when an admin opens these pages.

So I removed the loading checks, the metadata variables, and the code that only ran while loading.

Fixed Issues

$ #104583
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console
  1. Go to Workspace > Members > Invite member, select a few people and press Next. Verify the confirm page shows the members and the default welcome message.
  2. Press Role, pick a role, and verify it's shown on the confirm page.
  3. Edit the welcome message, go back to the member picker and forward again. Verify your message is kept. Press Invite and verify the members are added.
  4. Select a few members, choose Change role from the bulk actions menu, pick a role and save. Then open the change role page URL directly and verify you're sent back to the members page.
  5. Invite an email that has no Expensify account yet, so the member has no name. Open that member, press Display name, set a name and verify it saves. Then open the display name page URL again and verify the not-found page shows.
  6. (commuterExclusions and commuterExclusionsArrangements betas on.) Set a workspace address in Overview, then go to Distance rates > Settings > Exclude commutes and choose "Exclude usual commute". Select members, change their office location and work arrangement, and verify both update.
  7. Go to Workspace > Workflows > Add approval workflow. Pick members, an approver and an additional approver, and verify the workflow is created.
  8. Open an existing workflow, change its approver and members, save, and verify the changes are saved.

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_pt1.mp4
android_pt2.mp4
iOS: Native
ios.mov
MacOS: Chrome / Safari
web.mp4
web_pt2.mp4

@codecov

codecov Bot commented Nov 9, 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 Δ
src/components/WorkspaceMemberRoleList.tsx 98.55% <100.00%> (+0.13%) ⬆️
.../hooks/useRedirectSubmitWorkspaceFeatureUpgrade.ts 87.50% <100.00%> (ø)
...kspace/members/WorkspaceInviteMessageComponent.tsx 89.75% <100.00%> (+0.33%) ⬆️
...mbers/WorkspaceMembersChangeOfficeLocationPage.tsx 100.00% <100.00%> (ø)
...bers/WorkspaceMembersChangeWorkArrangementPage.tsx 100.00% <100.00%> (ø)
...ges/workspace/members/WorkspaceMembersRolePage.tsx 92.18% <100.00%> (-0.13%) ⬇️
...micWorkspaceWorkflowsApprovalsExpensesFromPage.tsx 84.49% <100.00%> (-0.12%) ⬇️
...rovals/WorkspaceWorkflowsApprovalsApproverPage.tsx 84.34% <100.00%> (-0.14%) ⬇️
.../approvals/WorkspaceWorkflowsApprovalsEditPage.tsx 92.10% <100.00%> (+0.57%) ⬆️
...rkspaceWorkflowsApprovalsOverLimitApproverPage.tsx 80.51% <100.00%> (-0.25%) ⬇️
... and 3 more
... and 119 files with indirect coverage changes

@VickyStash VickyStash changed the title Remove useOnyx loading status reads from workspace invite, member and approval pages Remove useOnyx loading status reads from workspace member and approval pages Nov 9, 2026
@VickyStash
VickyStash marked this pull request as ready for review November 9, 2026 15:34
@VickyStash
VickyStash requested review from a team as code owners November 9, 2026 15:34
@melvin-bot
melvin-bot Bot requested review from garrettmknight and nkdengineer and removed request for a team and garrettmknight November 9, 2026 15:34
@melvin-bot

melvin-bot Bot commented Nov 9, 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 9, 2026 15:34
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 9, 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-09T15:53:33.755062Z 6ebe366 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.

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

Copy link
Copy Markdown

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: 6ebe366d75

ℹ️ 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".

// Sending the invitation clears `invitedEmailsToAccountIDsDraft`, so opening this page with an empty draft means
// the invitation was already sent and we navigate back to the members screen
// eslint-disable-next-line react-hooks/exhaustive-deps -- the drafts are only read once, when the page opens
}, []);

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Reapply the welcome-note draft after its merge completes

When a user types the first custom welcome note and immediately leaves and reopens this page while that draft write is pending, setDraftValues() persists WorkspaceInviteMessageFormDraft with Onyx.merge (src/libs/actions/FormActions.ts:28-29), so formData can still be undefined on this mount and arrive later. This empty dependency array initializes the controlled welcomeNote to the default only once, so the later draft cannot restore the typed text; the previous loading transition reran the effect after the merge completed.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I've tested this scenario while recording videos and noticed no issue. Onyx.merge applies the change in a few microtasks, and leaving and reopening the page takes at least a frame, so formData already has the typed text

@nkdengineer

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-10.at.13.26.18.mov
Android: mWeb Chrome
Screen.Recording.2026-11-10.at.13.27.46.mov
iOS: HybridApp
Screen.Recording.2026-11-10.at.13.28.52.mov
iOS: mWeb Safari
Screen.Recording.2026-11-10.at.13.25.27.mov
MacOS: Chrome / Safari
Screen.Recording.2026-11-10.at.13.23.50.mov
Screen.Recording.2026-11-10.at.13.21.16.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 10, 2026 09:36
@VickyStash

Copy link
Copy Markdown
Contributor Author

Note: I'll be OOO tomorrow (national holiday in Poland 🇵🇱 )

@VickyStash

Copy link
Copy Markdown
Contributor Author

Failing checks are coming from main...

…atus-pt3

# Conflicts:
#	config/oxlint/oxlint.seatbelt.tsv

@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 @VickyStash @nkdengineer looks good to me

@mountiny
mountiny merged commit 3b93393 into Expensify:main Nov 10, 2026
36 of 37 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.

@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions

Copy link
Copy Markdown
Contributor

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.5.36-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed — this PR only removes redundant internal loading checks, without adding a feature, changing documented workflows or labels, or removing a beta gate.


view run

@MelvinBot

Copy link
Copy Markdown
Contributor

No FullStory changes needed — this PR only refactors redundant Onyx loading checks in existing workspace member and approval pages, without adding new screens, interactions, user-property values, or sensitive content.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.5.36-0 🚀

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

Bundle Size Analysis (Sentry):

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