fix: Workspace - The new WS names appear in English when Spanish is set up. by Krishna2323 · Pull Request #55850 · Expensify/App

Krishna2323 · 2025-01-28T10:19:26Z

Explanation of Change

Fixed Issues

$ #53599
PROPOSAL: #53599 (comment)

Tests

Create a new account
Go to settings > Click New Workspace
Verify the workspace name is {userName}'s Workspace > Confirm
Go back to settings > Click New Workspace
Verify the workspace name is {userName}'s Workspace 1
Repeat the steps 2 to 5 in spanish preference and verify workspace number increases every time

Verify that no errors appear in the JS console

Offline tests

Create a new account
Go to settings > Click New Workspace
Verify the workspace name is {userName}'s Workspace > Confirm
Go back to settings > Click New Workspace
Verify the workspace name is {userName}'s Workspace 1
Repeat the steps 2 to 5 in spanish preference and verify workspace number increases every time

QA Steps

Create a new account
Go to settings > Click New Workspace
Verify the workspace name is {userName}'s Workspace > Confirm
Go back to settings > Click New Workspace
Verify the workspace name is {userName}'s Workspace 1
Repeat the steps 2 to 5 in spanish preference and verify workspace number increases every time

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android_native.mp4

Android: mWeb Chrome

android_chrome.mp4

iOS: Native

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

MacOS: Chrome / Safari

web_chrome.mp4

MacOS: Desktop

desktop_app.mp4

…et up. Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

melvin-bot · 2025-01-29T12:38:49Z

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

Krishna2323 · 2025-01-29T12:41:14Z

@eVoloshchak, I haven't uploaded the recording for android native cause I'm facing app crash as soon as it starts. I will try to fix that and update the recordings if possible.

MonilBhavsar · 2025-02-03T22:46:04Z

@eVoloshchak 👋

eVoloshchak · 2025-02-06T15:23:14Z

src/languages/params.ts


 type GoToRoomParams = {roomName: string};

+type NewWorksacepNameParams = {userName: string; workspaceNumber?: number};


Suggested change

type NewWorksacepNameParams = {userName: string; workspaceNumber?: number};

type NewWorksaceNameParams = {userName: string; workspaceNumber?: number};

eVoloshchak · 2025-02-06T15:24:48Z

src/libs/actions/Policy/Policy.ts

+        .map((policy) => workspaceRegex.exec(policy?.name ?? ''))
+        .filter(Boolean) // Remove null matches
+        .map((match) => Number(match?.[1] ?? '0'));
+    const lastWorkspaceNumber = workspaceNumbers.length > 0 ? Math.max(...workspaceNumbers) : -Infinity;


Can we use null or undefined instead of -Infinity?

updated to undefined

eVoloshchak · 2025-02-06T15:28:34Z

src/libs/actions/Policy/Policy.ts

+        .map((match) => Number(match?.[1] ?? '0'));
+    const lastWorkspaceNumber = workspaceNumbers.length > 0 ? Math.max(...workspaceNumbers) : -Infinity;
+
+    return lastWorkspaceNumber !== -Infinity


Suggested change

return lastWorkspaceNumber !== -Infinity

return translateLocal('workspace.new.workspaceName', {userName: displayNameForWorkspace, workspaceNumber: lastWorkspaceNumber ? lastWorkspaceNumber + 1 : undefined})

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 · 2025-02-10T11:01:55Z

@eVoloshchak friendly bump.

eVoloshchak · 2025-02-12T17:20:38Z

src/libs/actions/Policy/Policy.ts

-    const lastWorkspaceNumber = Math.max(...parsedWorkspaceNumbers);
-    return lastWorkspaceNumber !== -Infinity ? `${defaultWorkspaceName} ${lastWorkspaceNumber + 1}` : defaultWorkspaceName;
+    const escapedName = escapeRegExp(displayNameForWorkspace);
+    const workspaceRegex = new RegExp(`(?:${escapedName}'s Workspace|Espacio de trabajo)\\s*(\\d+)?\\s*(?:de ${escapedName})?$`, 'i');


This will partially stop working when we add a third language. Could we instead iterate through locale files in src/languages and look for workspaceName values there?

I updated this to:

const workspaceTranslations = CONST.LANGUAGES.map((lang) => translate(lang, 'workspace.common.workspace')).join('|'); const workspaceRegex = new RegExp(`(?:${escapedName}'s ${workspaceTranslations})\\s*(\\d+)?\\s*(?:de ${escapedName})?$`, 'i');

eVoloshchak · 2025-02-12T17:21:24Z

And could you please take a look at GH checks failing? Merging with main should resolve some of it

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 · 2025-02-12T21:03:29Z

@eVoloshchak everything resolved.

Krishna2323 · 2025-02-15T15:11:14Z

@eVoloshchak friendly bump.

eVoloshchak · 2025-02-17T18:50:46Z

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
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 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
- 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 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)
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
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- 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
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- 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 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 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.
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: Native

Screen.Recording.2025-03-03.at.15.58.23.mov

Android: mWeb Chrome

screen-20250303-160106.mp4

iOS: Native

Screen.Recording.2025-03-03.at.15.43.36.mov

iOS: mWeb Safari

Screen.Recording.2025-03-03.at.15.45.15.mov

MacOS: Chrome / Safari

Screen.Recording.2025-03-03.at.15.38.30.mov

MacOS: Desktop

Screen.Recording.2025-03-03.at.15.35.02.mov

eVoloshchak · 2025-02-17T18:53:21Z

@Krishna2323, screen recording for Android: Native is missing from the checklist. Could you add it please?

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

MonilBhavsar · 2025-02-18T21:47:02Z

Is there a unit test we could implement for this?

We can, if needed. @MonilBhavsar WDYT?

Always good to add a test, if we can

Krishna2323 · 2025-02-21T21:32:16Z

Test will be added today, @eVoloshchak could you please check this comment? Thanks

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 · 2025-02-22T00:45:48Z

@eVoloshchak unit test is added.

eVoloshchak · 2025-02-24T16:00:55Z

src/libs/actions/Policy/Policy.ts

-    const lastWorkspaceNumber = Math.max(...parsedWorkspaceNumbers);
-    return lastWorkspaceNumber !== -Infinity ? `${defaultWorkspaceName} ${lastWorkspaceNumber + 1}` : defaultWorkspaceName;
+    const escapedName = escapeRegExp(displayNameForWorkspace);
+    const workspaceTranslations = CONST.LANGUAGES.map((lang) => translate(lang, 'workspace.common.workspace')).join('|');


Looks good, thanks!

eVoloshchak · 2025-02-24T16:04:42Z

tests/actions/PolicyTest.ts

 import Onyx from 'react-native-onyx';
+import {translateLocal} from '@libs/Localize';
+import BaseLocaleListener from '@libs/Localize/LocaleListener/BaseLocaleListener';
+// eslint-disable-next-line no-restricted-syntax


Suggested change

// eslint-disable-next-line no-restricted-syntax

Will deleting this line result in a linter error?

eVoloshchak · 2025-02-24T16:07:08Z

Also, could you add the screen recording for Android: Native, please? (it looks like it wasn't uploaded fully)

eVoloshchak

@Krishna2323, this stopped incrementing the workspace name (it was working before, there were no changes besides merging with main, weird)

Screen.Recording.2025-02-27.at.18.46.22.mov

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 · 2025-03-01T00:22:12Z

src/libs/actions/Policy/Policy.ts

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


@Krishna2323, this stopped incrementing the workspace name (it was working before, there were no changes besides merging with main, weird)

@eVoloshchak, I mistakenly removed the default value "0" when mapping over workspace number and that resulted in NaN which caused the issue. Added the default value back.

Works well now, thanks! Could you resolve the conflicts please?

conflicts resolved.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

eVoloshchak · 2025-03-03T14:43:16Z

@Krishna2323, could you change the last step to this please?

Repeat the steps 2 to 5 in Spanish preference and verify a)workspace number increases every time; b)when a new workspace is created, the name is in Spanish

eVoloshchak

LGTM!

MonilBhavsar

Looks good! Thanks for staying on this

OSBotify · 2025-03-04T04:41:12Z

✋ 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 · 2025-03-04T22:08:31Z

🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 9.1.9-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	success ✅

github-actions · 2025-03-04T22:51:38Z

🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 9.1.9-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	success ✅
🍎🔄 iOS HybridApp 🍎🔄	success ✅

github-actions · 2025-03-06T22:54:52Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.1.9-8 🚀

platform	result
🤖 android 🤖	true ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	failure ❌

Krishna2323 added 3 commits January 28, 2025 15:32

fix: Workspace - The new WS names appear in English when Spanish is s…

f2356e7

…et up. Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Merge branch 'Expensify:main' into krishna2323/issue/53599

61faaac

fix regex.

04956f8

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 marked this pull request as ready for review January 29, 2025 12:38

Krishna2323 requested a review from a team as a code owner January 29, 2025 12:38

melvin-bot bot requested a review from eVoloshchak January 29, 2025 12:38

melvin-bot bot removed the request for review from a team January 29, 2025 12:38

Krishna2323 mentioned this pull request Jan 29, 2025

[Due for payment 2025-03-13] [$250] Workspace - The new WS names appear in English when Spanish is set up #53599

Closed

8 tasks

Merge branch 'main' into krishna2323/issue/53599

cce2332

Merge branch 'Expensify:main' into krishna2323/issue/53599

d0c0a57

eVoloshchak suggested changes Feb 6, 2025

View reviewed changes

Krishna2323 added 4 commits February 7, 2025 02:09

Merge branch 'main' into krishna2323/issue/53599

a777e8f

minor fixes.

570944a

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

minor fix.

72934b8

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Merge branch 'main' into krishna2323/issue/53599

8aa5ad6

eVoloshchak reviewed Feb 12, 2025

View reviewed changes

Krishna2323 added 3 commits February 13, 2025 02:15

Merge branch 'Expensify:main' into krishna2323/issue/53599

b4d7bd4

prettier fix.

6050236

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

use workspace translation from translation files.

d8f6fa0

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Merge branch 'main' into krishna2323/issue/53599

ab7e0f8

Merge branch 'main' into krishna2323/issue/53599

5cbcb2d

Krishna2323 added 2 commits February 19, 2025 02:35

update regex.

84acf45

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

update regex.

1b6dd9b

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 added 5 commits February 22, 2025 03:28

Merge branch 'Expensify:main' into krishna2323/issue/53599

1cc31c6

add tests for generateDefaultWorkspaceName.

5dbcd85

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

minor update.

bd32149

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

fix eslint.

4dcbb66

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

fix eslint.

c871736

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

eVoloshchak reviewed Feb 24, 2025

View reviewed changes

Merge branch 'Expensify:main' into krishna2323/issue/53599

3e84282

eVoloshchak reviewed Feb 27, 2025

View reviewed changes

fix NaN values in workspaceNumbers.

2b02548

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 commented Mar 1, 2025

View reviewed changes

fix failint unit test.

b1f617c

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 force-pushed the krishna2323/issue/53599 branch from 9d1e75a to b1f617c Compare March 3, 2025 11:34

Krishna2323 added 2 commits March 3, 2025 17:05

Merge branch 'main' into krishna2323/issue/53599

7d9787e

minor fix.

349e5f4

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

eVoloshchak approved these changes Mar 3, 2025

View reviewed changes

melvin-bot bot requested a review from MonilBhavsar March 3, 2025 15:06

MonilBhavsar approved these changes Mar 4, 2025

View reviewed changes

MonilBhavsar merged commit 4cd92af into Expensify:main Mar 4, 2025
17 of 18 checks passed

github-actions bot mentioned this pull request Mar 4, 2025

Deploy Checklist: New Expensify 2025-03-04 #57792

Closed

77 tasks


		type GoToRoomParams = {roomName: string};

		type NewWorksacepNameParams = {userName: string; workspaceNumber?: number};

	type NewWorksacepNameParams = {userName: string; workspaceNumber?: number};
	type NewWorksaceNameParams = {userName: string; workspaceNumber?: number};

	return lastWorkspaceNumber !== -Infinity
	return translateLocal('workspace.new.workspaceName', {userName: displayNameForWorkspace, workspaceNumber: lastWorkspaceNumber ? lastWorkspaceNumber + 1 : undefined})

Conversation

Krishna2323 commented Jan 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jan 29, 2025

Uh oh!

Krishna2323 commented Jan 29, 2025

Uh oh!

MonilBhavsar commented Feb 3, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Krishna2323 commented Feb 10, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eVoloshchak commented Feb 12, 2025

Uh oh!

Krishna2323 commented Feb 12, 2025

Uh oh!

Krishna2323 commented Feb 15, 2025

Uh oh!

eVoloshchak commented Feb 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

eVoloshchak commented Feb 17, 2025

Uh oh!

MonilBhavsar commented Feb 18, 2025

Uh oh!

Krishna2323 commented Feb 21, 2025

Uh oh!

Krishna2323 commented Feb 22, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eVoloshchak commented Feb 24, 2025

Uh oh!

eVoloshchak left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eVoloshchak commented Mar 3, 2025

Uh oh!

eVoloshchak left a comment

Choose a reason for hiding this comment

Uh oh!

MonilBhavsar left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Krishna2323 commented Jan 28, 2025 •

edited

Loading

eVoloshchak commented Feb 17, 2025 •

edited

Loading