Merge pull request #42260 from rezkiy37/fix/40977-merge-account-name

Replace the "MERGED_" prefix correctly
Expensify · May 24, 2024 · c699735 · c699735
2 parents 2f16abb + baed85e
commit c699735
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/CONST.ts b/src/CONST.ts
@@ -73,7 +73,6 @@ const onboardingChoices = {
 type OnboardingPurposeType = ValueOf<typeof onboardingChoices>;
 
 const CONST = {
-    MERGED_ACCOUNT_PREFIX: 'MERGED_',
     DEFAULT_POLICY_ROOM_CHAT_TYPES: [chatTypes.POLICY_ADMINS, chatTypes.POLICY_ANNOUNCE, chatTypes.DOMAIN_ALL],
 
     // Note: Group and Self-DM excluded as these are not tied to a Workspace

diff --git a/src/libs/PersonalDetailsUtils.ts b/src/libs/PersonalDetailsUtils.ts
@@ -37,9 +37,9 @@ function getDisplayNameOrDefault(passedPersonalDetails?: Partial<PersonalDetails
     let displayName = passedPersonalDetails?.displayName ?? '';
 
     // If the displayName starts with the merged account prefix, remove it.
-    if (displayName.startsWith(CONST.MERGED_ACCOUNT_PREFIX)) {
+    if (new RegExp(CONST.REGEX.MERGED_ACCOUNT_PREFIX).test(displayName)) {
         // Remove the merged account prefix from the displayName.
-        displayName = displayName.substring(CONST.MERGED_ACCOUNT_PREFIX.length);
+        displayName = displayName.replace(CONST.REGEX.MERGED_ACCOUNT_PREFIX, '');
     }
 
     // If the displayName is not set by the user, the backend sets the diplayName same as the login so