fix: Handle merged account display name #32792

paultsimura · 2023-12-11T09:21:52Z

Details

Use PersonalDetailsUtils.getDisplayNameOrDefault where possible to escape the MERGED_{i} prefix in the merged account display names.

Fixed Issues

$ #32127
PROPOSAL: #32127 (comment)

Tests

Same as QA

Offline tests

It's impossible to perform all the needed steps when offline (merging, login-logout).

QA Steps

Log in as Account A;
Create a Workspace;
Invite other existing Accounts B and C to the workspace;
Send some messages in the #Announce room and in the workspace chat for the 2 users you have access to;
Remove the Account C from the workspace;
Login with Account B and mention Account C via @... in a room or chat;
Navigate to OldDot and Log in with Account B;
Merge the Account B with the Account C (that was just removed from the workspace);
Navigate back to the NewDot app and Log In with Account B;
Tap on Search Icon and write the created workspace name in step 2 e.g. "Workspace 28"
Tap on the archived workspace

*The "correct email" below will mean the email without MERGED_ prefix. i.e. bob@gmail.com, not MERGED_0@bob@gmail.com

Verify that in the header of the report, the correct email of the archived user is displayed
Verify that in the "Archived report" footer, the correct email of the archived user is displayed

Open Search and try searching for the merged account email

Verify that the email of the archived user is displayed correctly in the search list results

In the search, try searching for "merged"

Verify that the archived user cannot be searched by this term

Navigate to a chat/room from step 6

Verify that the mentioned archived username is displayed correctly (it may be displayed as "hidden" for once – just click it to fetch the personal details. It's a known bug and is being worked on in a different issue);

Click on the mentioned archived user to open the "Profile" page

Verify that the archived user's email is displayed correctly in the details and the "Message ..." button.

Type @ in the composer

Verify that the archived user's email is displayed correctly

PR Author Checklist

Screenshots/Videos

For clarity, in the Web section I provided side-to-side screenshots of fixed & prod behaviour.

Android: Native

android-compressed.mp4

Android: mWeb Chrome

chrome-compressed.mp4

iOS: Native

ios.mp4

iOS: mWeb Safari

safari.mp4

MacOS: Chrome / Safari

MacOS: Desktop

desktop.mp4

…ount prefix

melvin-bot · 2023-12-11T15:28:41Z

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

paultsimura · 2023-12-11T15:33:37Z

@allroundexperts this PR touches many places where the displayName is used. I tried to test all of the use cases that I could think of. Would appreciate your second glance at them as well 🙏

paultsimura · 2023-12-14T09:35:02Z

@allroundexperts a friendly bump on the PR review 🙏

allroundexperts · 2023-12-17T12:44:07Z

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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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.js 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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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.
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.2023-12-22.at.11.32.01.AM.mov

Android: mWeb Chrome

Screen.Recording.2023-12-22.at.11.30.08.AM.mov

iOS: Native

Screen.Recording.2023-12-22.at.11.28.11.AM.mov

iOS: mWeb Safari

Screen.Recording.2023-12-22.at.11.26.12.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2023-12-22.at.11.20.15.AM.mov

MacOS: Desktop

screen-recording-2023-12-22-at-112345-am_u7U5PfZV.mp4

allroundexperts · 2023-12-19T12:29:38Z

@paultsimura Can you please resolve conflicts here? Apologies for the delay in reviewing this one. I was supposed to review this last weekend but wasn't able to because of an urgent chore.

paultsimura · 2023-12-19T12:50:57Z

@allroundexperts It looks like the conflicting PR broke the getDisplayNameOrDefault logic. Asked here: #30169 (comment)

# Conflicts: # src/components/ArchivedReportFooter.tsx # src/libs/OptionsListUtils.js # src/libs/PersonalDetailsUtils.js # src/libs/SidebarUtils.ts # src/pages/DetailsPage.js # src/pages/ProfilePage.js # src/pages/ReportParticipantsPage.js # src/pages/home/report/ReportActionItem.js

paultsimura · 2023-12-19T18:24:04Z

@allroundexperts all yours

allroundexperts · 2023-12-22T06:42:46Z

@paultsimura Founds several instances of the MERGED@ format:

allroundexperts · 2023-12-22T06:43:56Z

@paultsimura I'm not sure but sometimes, I see Hidden and Hidden in the archived room chat footer and sometimes, proper emails show up. Can we please make sure that its always consistent?

paultsimura · 2023-12-22T09:02:06Z

Looking into it. Could you please share some more details for reproduction if you have them?

paultsimura · 2023-12-22T09:13:40Z

@allroundexperts this MERGED_0@email@gmail.com - is not a valid email address error at the bottom is coming from the server. We could replace it with RegExp as well, but I don't think we should touch it because it'll show:

email@gmail.com - is not a valid email address

Which will be more misleading than the same error with the MERGED_ prefix, what do you think?

# Conflicts: # src/pages/home/report/ReportActionItem.js

paultsimura · 2023-12-22T11:31:55Z

@allroundexperts
Regarding the "Hidden" and "Hidden", I suppose it's coming from the PersonalDetails not being loaded from the server initially, which should be out of the scope of this task, as I didn't touch the second user's displayName, and it still shows as "Hidden". It's the same thing with the mention showing as "@hidden" until we click on this mention and load the data from the BE.

However, I cannot reproduce this "Hidden and Hidden" case no matter how I tried. So if you could provide me with the reproduction steps so that I can double-check my point – it would be great

paultsimura · 2023-12-22T11:53:08Z

Fixed this, thank you:

# Conflicts: # src/pages/DetailsPage.js # src/pages/ProfilePage.js

paultsimura · 2023-12-26T12:58:34Z

@allroundexperts please re-review with the comments above.

# Conflicts: # src/libs/OptionsListUtils.js # src/libs/PersonalDetailsUtils.ts

paultsimura · 2023-12-29T13:51:39Z

@allroundexperts The longer it takes to finish reviewing this PR, the more conflicts and potential regressions appear, as PersonalDetailsUtils.getDisplayNameOrDefault is used in many places.
Please try to review it as soon as you are available, it's been a week since the last review

allroundexperts · 2023-12-31T17:25:20Z

@allroundexperts The longer it takes to finish reviewing this PR, the more conflicts and potential regressions appear, as PersonalDetailsUtils.getDisplayNameOrDefault is used in many places. Please try to review it as soon as you are available, it's been a week since the last review

Apologies for the delay here. I was OoO the previous week. I'll finish this up in coming days!

allroundexperts · 2024-01-02T08:34:33Z

@allroundexperts this MERGED_0@email@gmail.com - is not a valid email address error at the bottom is coming from the server. We could replace it with RegExp as well, but I don't think we should touch it because it'll show:
email@gmail.com - is not a valid email address
Which will be more misleading than the same error with the MERGED_ prefix, what do you think?

@paultsimura I think we should fix this on the server then. But lets not block this PR because of that.

allroundexperts

Looks good!

paultsimura · 2024-01-02T14:23:05Z

@allroundexperts the PR Reviewer checklist is failing, could you please handle that as well?

src/libs/ReportUtils.ts

OSBotify · 2024-01-04T19:03:09Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.4.22-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	cancelled 🔪
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2024-01-04T20:10:46Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.4.22-0 🚀

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

OSBotify · 2024-01-09T05:19:26Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.22-6 🚀

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

paultsimura added 3 commits December 1, 2023 12:48

Use PersonalDetailsUtils.getDisplayNameOrDefault to escape merged acc…

38c2d4e

…ount prefix

Merge branch 'main' into fix/32127-merged-account

b41be03

Use PersonalDetailsUtils.getDisplayNameOrDefault where possible

2db6120

paultsimura marked this pull request as ready for review December 11, 2023 15:28

paultsimura requested a review from a team as a code owner December 11, 2023 15:28

melvin-bot bot requested review from allroundexperts and removed request for a team December 11, 2023 15:28

paultsimura mentioned this pull request Dec 11, 2023

[$500] Workspace - Incorrect primary login displayed after merge with other account #32127

Closed

6 tasks

paultsimura force-pushed the fix/32127-merged-account branch from 3fa78e1 to 927011c Compare December 19, 2023 16:31

Fix after TS migration

f92050a

paultsimura force-pushed the fix/32127-merged-account branch from 927011c to f92050a Compare December 19, 2023 18:19

paultsimura added 2 commits December 22, 2023 10:25

Merge branch 'main' into fix/32127-merged-account

3f97bd7

Merge branch 'main' into fix/32127-merged-account

20f5d4a

# Conflicts: # src/pages/home/report/ReportActionItem.js

paultsimura added 2 commits December 22, 2023 12:49

Fix MERGED_ prefix on the WorkspaceMembers list

c9dc08b

Fix MERGED_ prefix on the RoomMembers list

7723c2b

Merge branch 'main' into fix/32127-merged-account

6c541d7

# Conflicts: # src/pages/DetailsPage.js # src/pages/ProfilePage.js

Merge branch 'main' into fix/32127-merged-account

b29ee2e

# Conflicts: # src/libs/OptionsListUtils.js # src/libs/PersonalDetailsUtils.ts

Fix merge conflicts

0f6fdd3

paultsimura force-pushed the fix/32127-merged-account branch from 83bb835 to 0f6fdd3 Compare December 29, 2023 13:54

allroundexperts approved these changes Jan 2, 2024

View reviewed changes

melvin-bot bot requested a review from roryabraham January 2, 2024 11:51

roryabraham requested changes Jan 2, 2024

View reviewed changes

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved

Add an explanatory comment for an early "Hidden" return

13edc94

paultsimura requested a review from roryabraham January 2, 2024 23:08

roryabraham approved these changes Jan 3, 2024

View reviewed changes

roryabraham merged commit 5049f8c into Expensify:main Jan 3, 2024

situchan mentioned this pull request Jan 3, 2024

[HOLD for payment 2024-02-14] [HOLD for payment 2024-01-18] Consolidate GetDislplayName methods #31312

Closed

github-actions bot mentioned this pull request Jan 4, 2024

Deploy Checklist: New Expensify 2024-01-04 #33973

Closed

74 tasks

fix: Handle merged account display name #32792

fix: Handle merged account display name #32792

Uh oh!

Conversation

paultsimura commented Dec 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

For clarity, in the Web section I provided side-to-side screenshots of fixed & prod behaviour.

Uh oh!

melvin-bot bot commented Dec 11, 2023

Uh oh!

paultsimura commented Dec 11, 2023

Uh oh!

paultsimura commented Dec 14, 2023

Uh oh!

allroundexperts commented Dec 17, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

allroundexperts commented Dec 19, 2023

Uh oh!

paultsimura commented Dec 19, 2023

Uh oh!

paultsimura commented Dec 19, 2023

Uh oh!

allroundexperts commented Dec 22, 2023

Uh oh!

allroundexperts commented Dec 22, 2023

Uh oh!

paultsimura commented Dec 22, 2023

Uh oh!

paultsimura commented Dec 22, 2023

Uh oh!

paultsimura commented Dec 22, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

paultsimura commented Dec 22, 2023

Uh oh!

paultsimura commented Dec 26, 2023

Uh oh!

paultsimura commented Dec 29, 2023

Uh oh!

allroundexperts commented Dec 31, 2023

Uh oh!

allroundexperts commented Jan 2, 2024

Uh oh!

allroundexperts left a comment

Choose a reason for hiding this comment

Uh oh!

paultsimura commented Jan 2, 2024

Uh oh!

Uh oh!

OSBotify commented Jan 4, 2024

Uh oh!

OSBotify commented Jan 4, 2024

Uh oh!

OSBotify commented Jan 9, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

paultsimura commented Dec 11, 2023 •

edited

Loading

allroundexperts commented Dec 17, 2023 •

edited

Loading

paultsimura commented Dec 22, 2023 •

edited

Loading