Skip to content

Refactor updateWorkspaceAvatar, deleteWorkspaceAvatar, & updateGeneralSettings to pass policy data#83458

Open
bernhardoj wants to merge 4 commits intoExpensify:mainfrom
bernhardoj:chore/66574-refactor-policy-to-use-useonyx-3
Open

Refactor updateWorkspaceAvatar, deleteWorkspaceAvatar, & updateGeneralSettings to pass policy data#83458
bernhardoj wants to merge 4 commits intoExpensify:mainfrom
bernhardoj:chore/66574-refactor-policy-to-use-useonyx-3

Conversation

@bernhardoj
Copy link
Contributor

Explanation of Change

Fixed Issues

$ #66574
PROPOSAL:

Tests

Same as QA Steps

  • Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Prerequisite: have a workspace

  1. Go to the workspace overview
  2. Add, replace, and remove the workspace avatar
  3. Update the workspace name and currency
  4. Go to Account > Preferences > Payment currency > Update to a different currency
  5. Verify everything works fine
  • 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
web.mp4

@bernhardoj bernhardoj requested review from a team as code owners February 25, 2026 16:07
@melvin-bot melvin-bot bot requested review from JmillsExpensify and parasharrajat and removed request for a team February 25, 2026 16:07
@melvin-bot
Copy link

melvin-bot bot commented Feb 25, 2026

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

value: {
errorFields,
name: policy.name,
outputCurrency: policy.outputCurrency,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We don't revert the name/currency, so I did it here.

@@ -1779,13 +1770,10 @@ function updateGeneralSettings(policyID: string | undefined, name: string, curre
currency,
};
finallyRates[rateID] = {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We use merge, so we don't need the whole object here

failureRates[rateID] = {
...currentRates[rateID],
pendingFields: {currency: null},
currency: currentRates[rateID].currency,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This reverts the currency too when fail

};
finallyRates[rateID] = {
...currentRates[rateID],
pendingFields: {currency: null},
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This applies the new currency even when fail, so I removed it

@github-actions
Copy link
Contributor

github-actions bot commented Feb 25, 2026

Code Review - PR #83458

Bug: Missed call site

File: src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPageEmptyState.tsx:98

This file imports updateGeneralSettings as updatePolicyGeneralSettings and calls it at line 98:

updatePolicyGeneralSettings(policy.id, policy.name, CONST.CURRENCY.USD);

After this PR's refactoring, updateGeneralSettings now expects OnyxEntry<Policy> as its first parameter instead of string | undefined. Passing policy.id (a string) will cause the \!policy?.id guard check to fail since strings don't have an id property, and the function will silently return without updating anything.

Fix: Change line 98 to:

updatePolicyGeneralSettings(policy, policy.name, CONST.CURRENCY.USD);

Note: TypeScript should catch this since the type changed, but wanted to flag it explicitly.


Other observations (non-blocking)

  1. Guard clause in WorkspaceOverviewPage.tsx onImageRemoved: The new guard \!policy.avatarURL || \!policy.originalFileName is a reasonable defensive check since deleteWorkspaceAvatar now requires both as non-optional strings. However, this changes behavior slightly — previously deleteWorkspaceAvatar could be called even when there was no avatar (it would just be a no-op on the backend). The new guard prevents the API call entirely, which is fine.

  2. Partial type change: The change from Record<string, Rate> to Record<string, Partial<Rate>> for finallyRates and failureRates is correct since these now only contain the fields that need to be merged, not full Rate objects.

  3. Tests: The new tests are well-structured with good coverage of both success and failure paths for all three refactored functions. Good use of mockFetch.pause()/resume() and mockFetch.fail() patterns.

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: 211fae2ad8

ℹ️ 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 597 to 598
if (!policyID || !policy.avatarURL || !policy.originalFileName) {
return;

Choose a reason for hiding this comment

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

P2 Badge Remove originalFileName gate before deleting workspace avatar

onImageRemoved now returns unless policy.originalFileName is truthy, but Policy.originalFileName is optional and some existing policies can have an avatarURL without that field populated. In that state, tapping remove silently does nothing because deleteWorkspaceAvatar() is never called, leaving the workspace avatar undeletable for affected users.

Useful? React with 👍 / 👎.

onSelect={(option: CurrencyListItem) => {
if (option.currencyCode !== paymentCurrency) {
updateGeneralSettings(personalPolicyID, personalPolicy?.name ?? '', option.currencyCode);
updateGeneralSettings(personalPolicy, personalPolicy?.name ?? '', option.currencyCode);

Choose a reason for hiding this comment

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

P2 Badge Prevent no-op currency updates before personal policy loads

This page now calls updateGeneralSettings(personalPolicy, ...), but updateGeneralSettings() bails out when policy?.id is missing. Because the currency list is rendered immediately (no loading guard), a user can select a currency while usePolicy(personalPolicyID) is still undefined, get navigated back, and never send an update request. The previous personalPolicyID call path did not introduce this silent first-load no-op.

Useful? React with 👍 / 👎.

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.

No product review required on this one.

@codecov
Copy link

codecov bot commented Feb 25, 2026

Codecov Report

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

Files with missing lines Coverage Δ
src/pages/workspace/WorkspaceNamePage.tsx 0.00% <ø> (ø)
...nsifyCard/WorkspaceExpensifyCardPageEmptyState.tsx 0.00% <ø> (ø)
...pages/settings/Preferences/PaymentCurrencyPage.tsx 0.00% <0.00%> (ø)
.../pages/workspace/WorkspaceOverviewCurrencyPage.tsx 0.00% <0.00%> (ø)
src/pages/workspace/WorkspaceOverviewPage.tsx 0.00% <0.00%> (ø)
src/libs/actions/Policy/Policy.ts 40.47% <75.00%> (+3.73%) ⬆️
... and 10 files with indirect coverage changes

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.

2 participants