Skip to content

Replace the old generateDefaultWorkspaceName with the new one#87706

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

Replace the old generateDefaultWorkspaceName with the new one#87706
bernhardoj wants to merge 10 commits intoExpensify:mainfrom
bernhardoj:chore/66574-refactor-policy-to-use-useonyx-17

Conversation

@bernhardoj
Copy link
Copy Markdown
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 second user who has a workspace with invoice enabled and currency set to the global reimbursement supported currency (USD, AUD, CAD, GBP, or EUR)
  • have payInvoiceViaExpensify beta enabled
  1. Sign up as a new user
  2. Select Manage my team & expenses and complete the onboarding
  3. Verify the workspace is created with the default name
  4. Delete the workspace
  5. Go to Account > Preferences and make sure Payment currency is set to a non-global-reimbursement-supported currency
  6. Open self DM
  7. Press the composer create button > Track distance
  8. Proceed to the confirmation page
  9. Press the Rate field
  10. Press Upgrade
  11. Verify the workspace is created with the default name
  12. Delete the workspace
  13. Go to the second account, send an invoice to the first account
  14. Back to the first account, press Pay > Pay as business > Mark as paid
  15. Verify the workspace is created with the default name
  16. Delete the workspace
  17. Go to Account > Preferences and make sure Payment currency is set to the global reimbursement supported currency
  18. Go to the second account, send another invoice to the first account
  19. Back to the first account, press Pay > Pay as business > Add bank account
  20. Verify the workspace is created with the default name
  • 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 April 11, 2026 13:41
@melvin-bot melvin-bot bot requested review from parasharrajat and trjExpensify and removed request for a team April 11, 2026 13:41
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 11, 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]

@melvin-bot melvin-bot bot removed request for a team and trjExpensify April 11, 2026 13:41
const [sessionEmail = ''] = useOnyx(ONYXKEYS.SESSION, {selector: emailSelector});
const lastWorkspaceNumberSelectorWithEmail = (policies: OnyxCollection<Policy>) => lastWorkspaceNumberSelector(policies, sessionEmail);
const [lastWorkspaceNumber] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: lastWorkspaceNumberSelectorWithEmail});
return generateDefaultWorkspaceName(sessionEmail, lastWorkspaceNumber, translate);
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 think it makes more sense to have this as a hook. In the last PR, I'll replace all lastWorkspaceNumberSelector usage with this hook.

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.

Never mind, it wasn't a good idea. I'll delete this

@bernhardoj
Copy link
Copy Markdown
Contributor Author

Btw, after testing, I noticed that we create the workspace with the default name, but after deleting the workspace and creating it again, the number still increases. For example:

  1. Create the first workspace
    A's Workspace 1 is created
  2. Delete the workspace
  3. Create another workspace
    A's Workspace 2 is created

I believe it should be
A's Workspace 1 is created

This happens on prod too. This is because after the workspace is deleted, the workspace data still stays on the onyx collection.

Screenshot 2026-04-11 at 21 22 39

If we want to change/fix this, we can either completely remove the workspace from Onyx or use shouldShowPolicy.

App/src/selectors/Policy.ts

Lines 178 to 181 in 1f51f18

const workspaceNumbers = Object.values(policies ?? {})
.map((policy) => workspaceRegex.exec(policy?.name ?? ''))
.filter(Boolean) // Remove null matches
.map((match) => Number(match?.[1] ?? '0'));

Copy link
Copy Markdown

@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: 89f55b26a3

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

policyOwnerEmail: undefined,
makeMeAdmin: policy?.makeMeAdmin,
policyName: policy?.name,
policyName: policy?.name ?? '',
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 Avoid empty policy names in draft track-expense workspace creation

This path now passes policy?.name ?? '' into buildPolicyData when isDraftReportLocal is true. Because this commit also removed the fallback name generation inside buildPolicyData, flows where policy is unresolved will send an empty policyName, which can create unnamed workspaces (or fail validation) during auto workspace creation from track-expense drafts.

Useful? React with 👍 / 👎.

@codecov
Copy link
Copy Markdown

codecov bot commented Apr 11, 2026

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.

1 participant