move message "admins only can post" from welcome message to footer by ahmedGaber93 · Pull Request #41199 · Expensify/App

ahmedGaber93 · 2024-04-29T11:23:14Z

Details

move message "admins only can post" from welcome message to report footer.

Fixed Issues

$ #39636
PROPOSAL: #39636 (comment)

Tests

Open the app in two devices.
In the first device login with user A.
Click fab > Start chat > Room.
Type the room name and set "Who can post." to "Admin only" then complete creating proccess.
Invite user B to the room.
In the other device login with user B and go to the room and Verify that "admins only can post" message is displayed on chat footer rather than welcome message.

Verify that no errors appear in the JS console

Offline tests

N/A.

QA Steps

Same as "Tests".

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

a.mov

Android: mWeb Chrome

aw.mov

iOS: Native

i.mov

iOS: mWeb Safari

iw.mov

MacOS: Chrome / Safari

w.mov

MacOS: Desktop

d.mov

…oter

melvin-bot · 2024-04-29T11:23:20Z

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

ahmedGaber93 · 2024-04-29T11:36:23Z

Hidden bug in android, but it is not related to PR changes, I think we may need to fix it in a separator ticket.
Android: in small screens, words not break correctly if just one or two letters out of the view in footer Banner.

Android

shawnborton · 2024-04-29T13:06:54Z

Looks correct to me. Small suggestion: what if we use the light bulb icon here instead of the exclamation point? It's just a little less scary/negative. I don't feel strongly though, thoughts @Expensify/design?

dannymcclain · 2024-04-29T13:10:05Z

Small suggestion: what if we use the light bulb icon here instead of the exclamation point? It's just a little less scary/negative.

100% agree. I think we should go lightbulb for this one.

trjExpensify · 2024-04-29T21:49:48Z

In the PR testing for this, can someone test a public room where an anon user can't post until they sign-in, and make sure the report footer doesn't get replaced by this message intended for "admin only" user-created rooms? Thanks!

dubielzyk-expensify · 2024-04-30T08:05:57Z

+3 for the lightbulb. Good to see all these messages getting consolidated 👍

rushatgabhane · 2024-04-30T16:10:49Z

@ahmedGaber93 could you please use lightbulb icon

ahmedGaber93 · 2024-04-30T16:14:34Z

@rushatgabhane Yes, I will use lightbulb icon, and push the commit in the next 3 hours.

# Conflicts: # src/pages/home/report/ReportFooter.tsx

ahmedGaber93 · 2024-04-30T19:39:48Z

can someone test a public room where an anon user can't post until they sign-in, and make sure the report footer doesn't get replaced by this message intended for "admin only" user-created rooms?

@trjExpensify Good catch 👍, fixed.

ahmedGaber93 · 2024-04-30T19:40:40Z

~~@shawnborton PR ready for review.~~ Sorry mention you by mistake.
@rushatgabhane PR ready for review.

shawnborton · 2024-04-30T20:21:56Z

All good! Let us know when new screenshots are available.

rushatgabhane · 2024-05-13T09:00:17Z

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 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.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 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.
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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

rushatgabhane

@ahmedGaber93 on iOS I can see an overflow. Could you please resolve it

shawnborton · 2024-05-13T11:39:49Z

Good catch. I think we would want that to spill over to a second line, with everything vertically centered in the box area.

ahmedGaber93 · 2024-05-14T22:14:14Z

@ahmedGaber93 on iOS I can see an overflow. Could you please resolve it

@rushatgabhane Yeah, I also face the same behavior in android, and mentioned it here #41199 (comment), but I think it is a Bug in Banner.tsx and need to handle separately. Banner.tsx text already broken to new line, but it always breaks out of the component border, see the below image.

what do you think?

# Conflicts: # src/components/ReportWelcomeText.tsx

ahmedGaber93 · 2024-05-18T19:08:58Z

@rushatgabhane bump here #41199 (comment)

rushatgabhane · 2024-05-20T07:14:29Z

I agree, it's an unrelated bug. Opened an issue for it - #42373

I strongly think that we shouldn't merge this PR until the overflow issue is resolved tho

rushatgabhane · 2024-05-20T07:42:04Z

@ahmedGaber93 it'd be great if you could post a fix for it on the issue

rushatgabhane · 2024-05-21T08:48:01Z

@ahmedGaber93 could you please resolve conflicts in the meanwhile

# Conflicts: # src/pages/home/ReportScreen.tsx # src/pages/home/report/ReportFooter.tsx

rushatgabhane · 2024-05-21T10:14:33Z

holding on #42398

rushatgabhane · 2024-05-30T20:38:49Z

@ahmedGaber93 please merge latest main. The hold is lifted

# Conflicts: # src/pages/home/report/ReportFooter.tsx

ahmedGaber93 · 2024-05-31T00:43:00Z

src/pages/home/report/ReportFooter.tsx

                    {!isArchivedRoom && blockedFromChat && <BlockedReportFooter />}
                    {!isAnonymousUser && !canWriteInReport && isSystemChat && <SystemChatReportFooterMessage />}
+                    {isAdminsOnlyPostingRoom && !isUserPolicyAdmin && !isArchivedRoom && !isAnonymousUser && !blockedFromChat && (
+                        <Banner


@rushatgabhane while merge I found we have a new feature now called blocked users in main branch which will display <BlockedReportFooter /> in the footer, so I add !blockedFromChat to this condition to prevent display both of them at the same time.

nice catch!

rushatgabhane

@robertjchen LGTM

ahmedGaber93 · 2024-06-06T16:11:36Z

@robertjchen bump for merge this.

OSBotify · 2024-06-07T03:09:53Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2024-06-11T23:31:25Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.81-11 🚀

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

move message "admins only can post" from welcome message to report fo…

e1114b5

…oter

ahmedGaber93 requested review from a team as code owners April 29, 2024 11:23

melvin-bot bot requested review from rushatgabhane and removed request for a team April 29, 2024 11:23

ahmedGaber93 mentioned this pull request Apr 29, 2024

[HOLD for payment 2024-06-18] [$250] mweb-room - For invited user "admins only can post" is replaced by room description #39636

Closed

6 tasks

ahmedGaber93 added 5 commits April 30, 2024 22:08

change Banner icon to lightbulb.

93f6543

hide "admin only can post" when is anonymous user

295e445

Merge branch 'main' into issue-39636

0504ebd

# Conflicts: # src/pages/home/report/ReportFooter.tsx

fix conflict

ce31674

prettier

e77ff93

rushatgabhane approved these changes May 13, 2024

View reviewed changes

melvin-bot bot requested a review from robertjchen May 13, 2024 09:18

rushatgabhane suggested changes May 13, 2024

View reviewed changes

Merge branch 'main' into issue-39636

ab9c739

Merge branch 'main' into issue-39636

d914797

# Conflicts: # src/components/ReportWelcomeText.tsx

rushatgabhane mentioned this pull request May 20, 2024

[HOLD for payment 2024-06-06] [$250] [Banner] text overflow on native #42373

Closed

Krishna2323 mentioned this pull request May 20, 2024

fix: [Banner] text overflow on native. #42398

Merged

50 tasks

Merge branch 'main' into issue-39636

0639b5f

# Conflicts: # src/pages/home/ReportScreen.tsx # src/pages/home/report/ReportFooter.tsx

ahmedGaber93 requested a review from rushatgabhane May 21, 2024 09:30

robertjchen previously approved these changes May 21, 2024

View reviewed changes

ahmedGaber93 added 2 commits May 31, 2024 02:44

Merge branch 'main' into issue-39636

079e852

# Conflicts: # src/pages/home/report/ReportFooter.tsx

hide "admin only can post" when is blocked from chat

8687095

ahmedGaber93 dismissed robertjchen’s stale review via 8687095 May 31, 2024 00:31

ahmedGaber93 commented May 31, 2024

View reviewed changes

ahmedGaber93 added 2 commits May 31, 2024 03:46

fix type script error 'archivedReportFooter' does not exist

35995b1

prettier

a59dd6b

robertjchen approved these changes May 31, 2024

View reviewed changes

rushatgabhane approved these changes Jun 3, 2024

View reviewed changes

melvin-bot bot requested a review from robertjchen June 3, 2024 10:42

robertjchen merged commit 1426c4e into Expensify:main Jun 7, 2024

github-actions bot mentioned this pull request Jun 10, 2024

Deploy Checklist: New Expensify 2024-06-10 #43344

Closed

lanitochka17 mentioned this pull request Jun 10, 2024

Room - When clicking "Start Chat" in Safari, a room name error is displayed #43391

Closed

6 tasks

Conversation

ahmedGaber93 commented Apr 29, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Apr 29, 2024

Uh oh!

ahmedGaber93 commented Apr 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shawnborton commented Apr 29, 2024

Uh oh!

dannymcclain commented Apr 29, 2024

Uh oh!

trjExpensify commented Apr 29, 2024

Uh oh!

dubielzyk-expensify commented Apr 30, 2024

Uh oh!

rushatgabhane commented Apr 30, 2024

Uh oh!

ahmedGaber93 commented Apr 30, 2024

Uh oh!

ahmedGaber93 commented Apr 30, 2024

Uh oh!

ahmedGaber93 commented Apr 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shawnborton commented Apr 30, 2024

Uh oh!

rushatgabhane commented May 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

rushatgabhane left a comment

Choose a reason for hiding this comment

Uh oh!

shawnborton commented May 13, 2024

Uh oh!

ahmedGaber93 commented May 14, 2024

Uh oh!

ahmedGaber93 commented May 18, 2024

Uh oh!

rushatgabhane commented May 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rushatgabhane commented May 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rushatgabhane commented May 21, 2024

Uh oh!

rushatgabhane commented May 21, 2024

Uh oh!

rushatgabhane commented May 30, 2024

Uh oh!

ahmedGaber93 May 31, 2024

Choose a reason for hiding this comment

Uh oh!

rushatgabhane Jun 3, 2024

Choose a reason for hiding this comment

Uh oh!

rushatgabhane left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ahmedGaber93 commented Jun 6, 2024

Uh oh!

OSBotify commented Jun 7, 2024

Uh oh!

OSBotify commented Jun 11, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

ahmedGaber93 commented Apr 29, 2024 •

edited

Loading

ahmedGaber93 commented Apr 30, 2024 •

edited

Loading

rushatgabhane commented May 13, 2024 •

edited

Loading

rushatgabhane commented May 20, 2024 •

edited

Loading

rushatgabhane commented May 20, 2024 •

edited

Loading

rushatgabhane left a comment •

edited

Loading