Fix: hide draft icon when composer hides #23641

Nikhil-Vats · 2023-07-26T12:45:06Z

Details

Hide the draft (pencil) icon in LHN when the composer hides (user is not allowed to comment).

Fixed Issues

$ #21835
PROPOSAL: #21835 (comment)

Tests

Open app and log in using an account which is an admin of a room with permissions set to all members. You can do this on your phone (a different device) for testing quickly rather than switching tabs on the same device.
On second tab/device, log in using an account which is a member of the room above.
On the second tab/device, navigate to the room chat and type a message. Verify that the pencil icon is visible.
Now on the first tab/device, open the room settings and change permission to admins only.
On the second tab/device, verify that the composer and the pencil icon are not visible any more.
Now on the first device, change permissions back to all members.
Go back to second tab/device, verify that the composer and draft icon reappear and you can see your draft message.

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Same as above.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

21835_web.mov

21835_web2.mov

Mobile Web - Chrome

21835_mweb_chrome.mov

Mobile Web - Safari

21835_mweb_safari.mov

Desktop

21835_desktop.mov

iOS

21835_ios.mov

Android

21835_android.mov

melvin-bot · 2023-07-26T12:45:11Z

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

Nikhil-Vats · 2023-07-27T22:48:43Z

Hey @parasharrajat, PR is ready for review.

parasharrajat · 2023-07-28T10:19:58Z

src/components/LHNOptionsList/OptionRowLHNData.js

+    const isAllowedToComment = useMemo(() => {
+        const {addWorkspaceRoomOrChatErrors} = ReportUtils.getReportOfflinePendingActionAndErrors(fullReport);
+        // if composer is hidden then user is not allowed to comment therefore draft icon should be hidden
+        return !ReportUtils.shouldHideComposer(fullReport, addWorkspaceRoomOrChatErrors);
+    }, [fullReport]);


let's moveisAllowedToComment inside SidebarUtils .getOptionData and on the main option item instead of passing is separately.

Done @parasharrajat

parasharrajat · 2023-07-28T12:59:17Z

src/libs/SidebarUtils.js

@@ -261,6 +262,11 @@ function getOptionData(report, personalDetails, preferredLocale, policy) {
    result.parentReportID = report.parentReportID || null;
    result.isWaitingOnBankAccount = report.isWaitingOnBankAccount;
    result.notificationPreference = report.notificationPreference || null;
+
+    const {addWorkspaceRoomOrChatErrors} = ReportUtils.getReportOfflinePendingActionAndErrors(report);
+    // if composer is hidden then user is not allowed to comment, this is used to hide draft icon


Suggested change

// if composer is hidden then user is not allowed to comment, this is used to hide draft icon

// If the composer is hidden then the user is not allowed to comment, same can be used to hide the draft icon.

parasharrajat · 2023-07-28T12:59:40Z

src/libs/SidebarUtils.js

@@ -227,6 +227,7 @@ function getOptionData(report, personalDetails, preferredLocale, policy) {
        isExpenseRequest: false,
        isWaitingOnBankAccount: false,
        isLastMessageDeletedParentAction: false,
+        isAllowedToComment: false,


Suggested change

isAllowedToComment: false,

isAllowedToComment: true,

parasharrajat · 2023-07-28T13:00:11Z

More requests.

Nikhil-Vats · 2023-07-28T13:11:51Z

Updated as per your latest feedback @parasharrajat

parasharrajat · 2023-07-28T13:41:01Z

Screenshots

🔲 iOS / native

Screen.Recording.2023-07-28.at.7.20.59.PM.mov

🔲 iOS / Safari

Screen.Recording.2023-07-28.at.7.18.03.PM.mov

🔲 MacOS / Desktop

Screen.Recording.2023-07-28.at.7.16.05.PM.mov

🔲 MacOS / Chrome

Screen.Recording.2023-07-28.at.7.15.08.PM.mov

🔲 Android / Chrome

Screen.Recording.2023-07-28.at.7.20.17.PM.mov

🔲 Android / native

Screen.Recording.2023-07-28.at.7.37.11.PM.mov

parasharrajat

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

🎀 👀 🎀 C+ reviewed

Nikhil-Vats · 2023-08-01T11:37:05Z

Hey @madmax330, friendly bump here.

OSBotify · 2023-08-01T15:25:09Z

✋ 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 · 2023-08-02T01:22:15Z

🚀 Deployed to staging by https://github.com/madmax330 in version: 1.3.49-0 🚀

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

mvtglobally · 2023-08-02T02:21:08Z

@Nikhil-Vats
Can you please update the QA steps to reflect what exactly needs to be tested in staging only.

cc @parasharrajat @madmax330 we are not able to switch between Dev and Staging

Nikhil-Vats · 2023-08-02T02:43:27Z

Done @mvtglobally.
You can test this using two tabs or two devices in the staging environment. Please check the steps and let me know if there's any doubt.

OSBotify · 2023-08-03T17:43:31Z

🚀 Deployed to staging by https://github.com/madmax330 in version: 1.3.50-0 🚀

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

OSBotify · 2023-08-03T18:14:42Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.3.49-3 🚀

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

OSBotify · 2023-08-07T18:31:51Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.50-3 🚀

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

Nikhil-Vats requested a review from a team as a code owner July 26, 2023 12:45

melvin-bot bot removed the request for review from a team July 26, 2023 12:45

melvin-bot bot requested a review from parasharrajat July 26, 2023 12:45

Nikhil-Vats marked this pull request as draft July 26, 2023 13:03

Nikhil-Vats force-pushed the 21835_hide_draft_icon_when_composer_hides branch from fee462a to 10efb8c Compare July 26, 2023 13:41

Fix: hide draft icon when composer hides

ab03141

Nikhil-Vats force-pushed the 21835_hide_draft_icon_when_composer_hides branch from 10efb8c to ab03141 Compare July 27, 2023 21:16

Nikhil-Vats marked this pull request as ready for review July 27, 2023 22:46

parasharrajat suggested changes Jul 28, 2023

View reviewed changes

Move isAllowedToComment to SidebarUtils

ab054b2

parasharrajat reviewed Jul 28, 2023

View reviewed changes

Change default value of isAllowedToComment

88216fd

parasharrajat approved these changes Jul 28, 2023

View reviewed changes

melvin-bot bot requested a review from madmax330 July 28, 2023 14:08

madmax330 approved these changes Aug 1, 2023

View reviewed changes

madmax330 merged commit 1ec7719 into Expensify:main Aug 1, 2023

OSBotify mentioned this pull request Aug 1, 2023

Deploy Checklist: New Expensify 2023-08-01 #24028

Closed

79 tasks

OSBotify mentioned this pull request Aug 3, 2023

Deploy Checklist: New Expensify 2023-08-03 #24121

Closed

86 tasks

melvin-bot bot mentioned this pull request Aug 3, 2023

[HOLD for payment 2023-08-10] [$1000] Chat - Account B will have a pencil saved when only the admin can write in the announcement room #21835

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: hide draft icon when composer hides #23641

Fix: hide draft icon when composer hides #23641

Nikhil-Vats commented Jul 26, 2023 •

edited

Loading

melvin-bot bot commented Jul 26, 2023

Nikhil-Vats commented Jul 27, 2023

parasharrajat Jul 28, 2023

Nikhil-Vats Jul 28, 2023

parasharrajat Jul 28, 2023

parasharrajat Jul 28, 2023

parasharrajat commented Jul 28, 2023

Nikhil-Vats commented Jul 28, 2023 •

edited

Loading

parasharrajat commented Jul 28, 2023 •

edited

Loading

parasharrajat left a comment

Nikhil-Vats commented Aug 1, 2023

OSBotify commented Aug 1, 2023

OSBotify commented Aug 2, 2023

mvtglobally commented Aug 2, 2023

Nikhil-Vats commented Aug 2, 2023

OSBotify commented Aug 3, 2023

OSBotify commented Aug 3, 2023

OSBotify commented Aug 7, 2023

	// if composer is hidden then user is not allowed to comment, this is used to hide draft icon
	// If the composer is hidden then the user is not allowed to comment, same can be used to hide the draft icon.

Fix: hide draft icon when composer hides #23641

Fix: hide draft icon when composer hides #23641

Conversation

Nikhil-Vats commented Jul 26, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 26, 2023

Nikhil-Vats commented Jul 27, 2023

parasharrajat Jul 28, 2023

Choose a reason for hiding this comment

Nikhil-Vats Jul 28, 2023

Choose a reason for hiding this comment

parasharrajat Jul 28, 2023

Choose a reason for hiding this comment

parasharrajat Jul 28, 2023

Choose a reason for hiding this comment

parasharrajat commented Jul 28, 2023

Nikhil-Vats commented Jul 28, 2023 • edited Loading

parasharrajat commented Jul 28, 2023 • edited Loading

Screenshots

🔲 iOS / native

🔲 iOS / Safari

🔲 MacOS / Desktop

🔲 MacOS / Chrome

🔲 Android / Chrome

🔲 Android / native

parasharrajat left a comment

Choose a reason for hiding this comment

Reviewer Checklist

Nikhil-Vats commented Aug 1, 2023

OSBotify commented Aug 1, 2023

OSBotify commented Aug 2, 2023

mvtglobally commented Aug 2, 2023

Nikhil-Vats commented Aug 2, 2023

OSBotify commented Aug 3, 2023

OSBotify commented Aug 3, 2023

OSBotify commented Aug 7, 2023

Nikhil-Vats commented Jul 26, 2023 •

edited

Loading

Nikhil-Vats commented Jul 28, 2023 •

edited

Loading

parasharrajat commented Jul 28, 2023 •

edited

Loading