-
Notifications
You must be signed in to change notification settings - Fork 2.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use oldPolicyName report field for archived workspace chats #8436
Conversation
# Conflicts: # src/components/ArchivedReportFooter.js # src/components/ReportWelcomeText.js # src/libs/OptionsListUtils.js
# Conflicts: # src/libs/OptionsListUtils.js # src/libs/actions/ReportActions.js # src/pages/home/report/ReportActionsView.js # src/pages/home/sidebar/SidebarLinks.js
@@ -7,7 +7,7 @@ import CONST from '../CONST'; | |||
* @returns {String} | |||
*/ | |||
function getEmailWithoutMergedAccountPrefix(email) { | |||
return email.replace(/^MERGED_0@/, ''); | |||
return email.replace(/^MERGED_\d@/, ''); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a random fix, but this code makes it look like theoretically we could have MERGED_1
or MERGED_2
@marcaaron Thanks for the thorough review, this is ready for another round of reviews. |
Hopefully everything you mentioned in your review has been addressed. Dismissing since you're OOO this week
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
🚀 Deployed to staging by @roryabraham in version: 1.1.58-0 🚀
|
🚀 Deployed to production by @AndrewGable in version: 1.1.60-3 🚀
|
Details
Uses the oldPolicyName rNVP to display the policy name on archived workspace chats.
Fixed Issues
$ https://github.com/Expensify/Expensify/issues/204324
Tests / QA Steps
+COUNTRY_CODE
prefix), user D.#admins
. Verify that you see the name of the room in the chat header. Verify that you see the name of the policy as a subtitle in the chat header.Workspace
as the subtitle in the chat header.Settings
->Preferences
and change your language toEspañol
.Espacio de trabajo
as the subtitle in the chat header.Settings
->Preferences
and change your language back toEnglish
.Settings
->Policies
and delete the workspace.#admins
. Verify that you see#admins (archived)
in the chat header.Settings
->Preferences
and change your language toEspañol
.#admins
room. Verify that you see#admins (archivado)
in the chat header.Settings
->Preferences
and change your language back toEnglish
.(archived)
in the chat header, and the workspace name as a subtitle in the chat header.1 Open the workspace chat for user B.
(archivado)
in the chat header, and the workspace name as a subtitle in the chat header.(archived)
in the chat header, and the workspace name as a subtitle in the chat header.(archivado)
in the chat header, and the workspace name as a subtitle in the chat header.(archived)
in the chat header, and the workspace name as a subtitle in the chat header.(archivado)
in the chat header, and the workspace name as a subtitle in the chat header.(archived)
in the chat header, and justWorkspace
as the subtitle.(archivado)
in the chat header, andEspacio de trabajo
as the subtitle.Important: When staging QA is complete, make sure that the above steps are added to the regression testing suite in TestRail.
PR Review Checklist
Contributor (PR Author) Checklist
### Fixed Issues
section aboveTests
sectionQA steps
sectiontoggleReport
and notonIconClick
)src/languages/*
filesSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)/** comment above it */
displayName
propertythis
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor)this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)PR Reviewer Checklist
### Fixed Issues
section aboveTests
sectionQA steps
sectiontoggleReport
and notonIconClick
).src/languages/*
filesSTYLE.md
) were followed/** comment above it */
displayName
propertythis
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor)this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)Screenshots
Web
(I know that the sidebar still isn't correct – want to treat that as a separate issue).
Mobile Web
Desktop
iOS
Android