Create a new generateDefaultWorkspaceName by bernhardoj · Pull Request #85789 · Expensify/App

bernhardoj · 2026-03-19T12:24:43Z

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

Login as a new user
Complete the onboarding by selecting "Manage my team expenses"
Verify the new workspace is created with a default name ({display name}'s Workspace)
Create a new workspace
Verify the new workspace name has a number incrementing

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

…AllPolicies

melvin-bot · 2026-03-19T12:24:52Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 3f5ac7daf1

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

chatgpt-codex-connector · 2026-03-19T12:38:41Z

src/libs/actions/App.ts

    type?: PolicyType;
    // TODO: Remove optional (?) once allBetas Onyx.connect is removed (https://github.com/Expensify/App/issues/66417)
    betas?: OnyxEntry<OnyxTypes.Beta[]>;
+    lastWorkspaceNumber: number | undefined;


Pass lastWorkspaceNumber to the name generator

This new parameter never gets consumed inside createWorkspaceWithPolicyDraftAndNavigateToIt(): the function still calls createDraftInitialWorkspace()/createWorkspace() without it, and those paths still fall back to generateDefaultWorkspaceName(). In the /transition?...exitTo=workspace/new flow this change is targeting, the new selector/hook becomes a no-op, so users who already have "… Workspace" workspaces still get another base name instead of the expected incremented suffix.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-03-19T12:38:41Z

src/libs/Navigation/AppNavigator/AuthScreensInitHandler.tsx

        }

-        App.setUpPoliciesAndNavigate(session, introSelected, activePolicyID, isSelfTourViewed);
+        App.setUpPoliciesAndNavigate(session, introSelected, activePolicyID, isSelfTourViewed, lastWorkspaceNumber);


Delay transition workspace creation until policies hydrate

lastWorkspaceNumber is read inside a mount-only effect, so setUpPoliciesAndNavigate() only ever sees the first render’s value. On fresh logins or cleared caches, useLastWorkspaceNumber() will still be undefined when this effect runs, and the workspace is auto-created before openApp()/reconnectApp() finish hydrating the policy collection. Because the effect never reruns when the selector updates, the duplicate-name case still reproduces in that environment.

Useful? React with 👍 / 👎.

parasharrajat · 2026-03-19T13:56:46Z

src/hooks/useLastWorkspaceNumber.ts

@@ -0,0 +1,15 @@
+import type {OnyxCollection} from 'react-native-onyx';
+import useOnyx from '@hooks/useOnyx';


issues @bernhardoj

parasharrajat · 2026-03-19T13:57:34Z

src/libs/actions/Policy/Policy.ts

+ * @param [email] the email to base the workspace name on. If not passed, will use the logged-in user's email instead
+ * @param [lastWorkspaceNumber] the last workspace number
+ */
+function newGenerateDefaultWorkspaceName(email = '', lastWorkspaceNumber: number | undefined): string {


bernhardoj · 2026-03-20T02:55:29Z

Hmm, somehow some of my changes are not commited 🤦

create a new generateDefaultWorkspaceName that doesn't use deprecated…

3f5ac7d

…AllPolicies

bernhardoj requested review from a team as code owners March 19, 2026 12:24

melvin-bot bot assigned bernhardoj Mar 19, 2026

melvin-bot bot requested review from parasharrajat and trjExpensify and removed request for a team and trjExpensify March 19, 2026 12:24

chatgpt-codex-connector bot reviewed Mar 19, 2026

View reviewed changes

parasharrajat suggested changes Mar 19, 2026

View reviewed changes

Merge branch 'main' into chore/66574-refactor-policy-to-use-useonyx-9

d2efed7

bernhardoj added 3 commits March 20, 2026 11:00

use the new generateDefaultWorkspaceName

80a6e20

int

8d2a524

remove unused param (yet)

e14eb14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Create a new generateDefaultWorkspaceName#85789

Create a new generateDefaultWorkspaceName#85789
bernhardoj wants to merge 5 commits intoExpensify:mainfrom
bernhardoj:chore/66574-refactor-policy-to-use-useonyx-9

bernhardoj commented Mar 19, 2026

Uh oh!

melvin-bot bot commented Mar 19, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

chatgpt-codex-connector bot Mar 19, 2026

Uh oh!

chatgpt-codex-connector bot Mar 19, 2026

Uh oh!

parasharrajat Mar 19, 2026

Uh oh!

parasharrajat Mar 19, 2026

Uh oh!

bernhardoj commented Mar 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		@@ -0,0 +1,15 @@
		import type {OnyxCollection} from 'react-native-onyx';
		import useOnyx from '@hooks/useOnyx';

Conversation

bernhardoj commented Mar 19, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Mar 19, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

parasharrajat Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

parasharrajat Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

bernhardoj commented Mar 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants