fix:copy-update admin only posting rooms by ishpaul777 · Pull Request #24643 · Expensify/App

ishpaul777 · 2023-08-16T19:47:40Z

Details

Fixed Issues

$ #23819
PROPOSAL: #23819 (comment)

Tests

Verify that no errors appear in the JS console.
Create 2 accounts "User A" "User B".
As "User A" account Create a Workspace. Invite "User B".
As "User A" account Create a room (say #test). Invite "User B".
Verify Hero text in begining of chat history of room is
- in English - Welcome to #room_name!
- in Spanish - ¡Bienvenido a #room_name!
As "User A" Navigate to room Details -> Settings -> change Who Can Post to "Admins Only"
Verify Body text in begining of chat history of any room is
- in English - Only admins can send messages in this room.
- in Spanish - Solo los administradores pueden enviar mensajes en esta sala.

Offline tests

Same as Test steps above

QA Steps

Verify that no errors appear in the JS console
Same as Test steps above

PR Author Checklist

Screenshots/Videos

Web

Screen.Recording.2023-08-22.at.2.10.07.AM-1.mov

Mobile Web - Chrome

Screen.Recording.2023-08-22.at.2.43.46.AM-1.mov

Screen.Recording.2023-08-22.at.2.45.52.AM-1.mov

Mobile Web - Safari

Screen.Recording.2023-08-22.at.2.22.52.AM-1.mov

Desktop

Screen.Recording.2023-08-22.at.2.36.53.AM.mov

iOS

Screen.Recording.2023-08-22.at.3.27.32.AM.mov

Android

android.mp4

melvin-bot · 2023-08-16T19:48:13Z

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

ishpaul777 · 2023-08-16T19:48:58Z

I have read the CLA Document and I hereby sign the CLA

ishpaul777 · 2023-08-16T20:04:24Z

will update videos for all platforms, waiting for confirmation #23819 (comment)

ishpaul777 · 2023-08-17T19:43:33Z

@eVoloshchak PR is up for your review

ishpaul777 · 2023-08-18T19:22:42Z

@joelbettner since you are assigned by melvin can you review please?

eVoloshchak · 2023-08-21T15:17:10Z

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 / Chrome
- iOS / native
- iOS / 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(themeColors.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 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

Web

Screen.Recording.2023-08-21.at.23.53.53.mov

Mobile Web - Chrome

screen-20230821-235646.mp4

Mobile Web - Safari

Screen.Recording.2023-08-21.at.23.53.16.mov

Desktop

Screen.Recording.2023-08-21.at.23.54.30.mov

iOS

Screen.Recording.2023-08-21.at.23.51.02.mov

Android

screen-20230821-235940.mp4

eVoloshchak · 2023-08-21T16:10:16Z

@ishpaul777, the code looks good, there are a couple of small changes required

Change Tests to a numbered list of tests a manual QA tester would perform (something like tests in [$1000] Copy update for #announce rooms #23819, but extended)
It shouldn't say Only admins can send messages in this room if user is an admin
Pull the latest changes from main

ishpaul777 · 2023-08-21T16:25:38Z

I am making the required changes. Just one question is there a utility get user role? if not can you point me to similar situation and how it is handled in codebase?

eVoloshchak · 2023-08-21T16:27:23Z

PolicyUtils.isPolicyAdmin is what you need I think

ishpaul777 · 2023-08-21T17:33:17Z

what should be the copy for admins in room? is it the same as when room is for all Members to send messages.
Collaboration between all {workspace} members starts here! 🎉 Use {room_name} to chat about anything {workspace} related.
@eVoloshchak

joelbettner

👍

ishpaul777 · 2023-08-21T17:51:13Z

please confirm if these are copy for welcome messages in different conditions. (I dont want to make a assumption that may results is regression later). i'll commit and upload videos as soon as i get confirmation

 if (isAdminsOnlyPostingRoom(report) && !isUserPolicyAdmin) {
        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminOnlyPostingRoom');
    } else if (isAnnounceRoom(report)) {
        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAnnounceRoomPartOne', {workspaceName});
        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAnnounceRoomPartTwo', {workspaceName});
    }

eVoloshchak · 2023-08-21T18:01:52Z

is it the same as when room is for all Members to send messages

@ishpaul777, yes, exactly

eVoloshchak · 2023-08-21T19:03:05Z

@ishpaul777, tests are failing

ishpaul777 · 2023-08-21T19:10:39Z

@eVoloshchak fixed

ishpaul777 · 2023-08-21T20:57:15Z

@eVoloshchak Please review changes I'll add videos if everything looks good to you.

melvin-bot · 2023-08-21T21:01:32Z

🎯 @eVoloshchak, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #25621.

OSBotify · 2023-08-22T01:16:51Z

🚀 Deployed to staging by https://github.com/joelbettner in version: 1.3.56-2 🚀

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

aldo-expensify · 2023-08-22T22:16:41Z

This PR is causing this regression: #25718

aldo-expensify · 2023-08-22T22:17:49Z

+                        {(!isAdminsOnlyPostingRoom || isUserPolicyAdmin) && (
+                            <>
+                                <Text
+                                    style={[styles.textStrong]}
+                                    onPress={() => Navigation.navigate(ROUTES.getReportDetailsRoute(props.report.reportID))}
+                                    suppressHighlighting
+                                >
+                                    {ReportUtils.getReportName(props.report)}
+                                </Text>
+                                <Text>{roomWelcomeMessage.phrase2}</Text>
+                            </>
+                        )}


I guess the check should have rendered the second phrase if the room was archived

This change caused this regression: #25718

OSBotify · 2023-08-24T03:05:44Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.56-24 🚀

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

OSBotify · 2023-08-28T18:54:24Z

🚀 Deployed to staging by https://github.com/joelbettner in version: 1.3.58-0 🚀

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

OSBotify · 2023-08-30T01:23:26Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.58-5 🚀

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

fix:copy-update admin only posting rooms

44fe68d

ishpaul777 requested a review from a team as a code owner August 16, 2023 19:47

melvin-bot Bot requested review from joelbettner and removed request for a team August 16, 2023 19:48

code formatting

7181476

fix spanish copy

24fdf8c

joelbettner requested a review from eVoloshchak August 18, 2023 20:29

ishpaul777 added 2 commits August 21, 2023 22:35

Merge branch 'main' into copy-update-admin-only-posting-rooms

0039823

Merge branch 'main' into copy-update-admin-only-posting-rooms

541ab1e

joelbettner previously approved these changes Aug 21, 2023

View reviewed changes

fix room welcome message if user is admin

ee977aa

ishpaul777 dismissed joelbettner’s stale review via ee977aa August 21, 2023 18:55

remove unneccessary translation keys

d7aebbf

eVoloshchak reviewed Aug 21, 2023

View reviewed changes

Comment thread src/components/ReportWelcomeText.js Outdated

eVoloshchak reviewed Aug 21, 2023

View reviewed changes

Comment thread src/components/ReportWelcomeText.js

ishpaul777 requested a review from eVoloshchak August 21, 2023 20:07

fix: update hero text for all rooms

441a76b

eVoloshchak approved these changes Aug 21, 2023

View reviewed changes

melvin-bot Bot mentioned this pull request Aug 21, 2023

Payment issue for E/App PR#24643 #25621

Closed

joelbettner approved these changes Aug 21, 2023

View reviewed changes

joelbettner merged commit c053381 into Expensify:main Aug 21, 2023

OSBotify mentioned this pull request Aug 22, 2023

Deploy Checklist: New Expensify 2023-08-21 #25625

Closed

lanitochka17 mentioned this pull request Aug 22, 2023

[$250] Web - Console error shows up when creating room and opening room chat #25717

Closed

6 tasks

aldo-expensify mentioned this pull request Aug 22, 2023

[HOLD for payment 2023-09-04] Room - Missing text in 'You missed the party in' message when 'Admin only' room is deleted #25718

Closed

6 tasks

aldo-expensify reviewed Aug 22, 2023

View reviewed changes

eVoloshchak mentioned this pull request Aug 28, 2023

[$1000] Copy update for #announce rooms #23819

Closed

6 tasks

OSBotify mentioned this pull request Aug 28, 2023

Deploy Checklist: New Expensify 2023-08-28 #26113

Closed

Conversation

ishpaul777 commented Aug 16, 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

Uh oh!

melvin-bot Bot commented Aug 16, 2023

Uh oh!

ishpaul777 commented Aug 16, 2023

Uh oh!

ishpaul777 commented Aug 16, 2023

Uh oh!

ishpaul777 commented Aug 17, 2023

Uh oh!

ishpaul777 commented Aug 18, 2023

Uh oh!

eVoloshchak commented Aug 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

eVoloshchak commented Aug 21, 2023

Uh oh!

ishpaul777 commented Aug 21, 2023

Uh oh!

eVoloshchak commented Aug 21, 2023

Uh oh!

ishpaul777 commented Aug 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joelbettner left a comment

Choose a reason for hiding this comment

Uh oh!

ishpaul777 commented Aug 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

eVoloshchak commented Aug 21, 2023

Uh oh!

eVoloshchak commented Aug 21, 2023

Uh oh!

ishpaul777 commented Aug 21, 2023

Uh oh!

Uh oh!

Uh oh!

ishpaul777 commented Aug 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

melvin-bot Bot commented Aug 21, 2023

Uh oh!

OSBotify commented Aug 22, 2023

Uh oh!

aldo-expensify commented Aug 22, 2023

Uh oh!

aldo-expensify Aug 22, 2023

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Aug 24, 2023

Uh oh!

OSBotify commented Aug 28, 2023

Uh oh!

OSBotify commented Aug 30, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

ishpaul777 commented Aug 16, 2023 •

edited

Loading

eVoloshchak commented Aug 21, 2023 •

edited

Loading

ishpaul777 commented Aug 21, 2023 •

edited

Loading

ishpaul777 commented Aug 21, 2023 •

edited

Loading

ishpaul777 commented Aug 21, 2023 •

edited

Loading