[No QA] Handle Moderated Messages in UI #19476

dangrous · 2023-05-23T18:45:30Z

Details

This SHOULD work but right now you have to manually adjust the state to make the messages "flagged" to test it because we don't have moderationDecisions yet.

IOS was broken for me on dev - both on main and in this branch, so it's unrelated - so I was unable to get a screenshot. Please check this platform extra carefully. (I tried for like 30 min to fix it but haven't yet.)

Fixed Issues

$ #18509

Tests

For now, please edit this line to be default true
and this line to be default the status you're attempting to test. (functionality to actually moderate these messages isn't quite there but this needs to go out soon.

The effects should be:

APPROVED and PENDING - no visible change from existing behavior
PENDING_HIDE and HIDDEN should be hidden as in the screenshots, with option to reveal

These will be sent to the frontend via themoderatorDecision in the message array, it will look like:

moderatorDecision: [{
	decision: "pending"/"pendingHide"/"removed"/"hidden"/"approved",
	timestamp: timestamp
}]

There will only be one decision max.

Verify that no errors appear in the JS console

Offline tests

Same as online

QA Steps

No actual QA for now - just change the default status of messages as noted above to see the effects.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

src/pages/home/report/ReportActionItem.js

melvin-bot · 2023-05-26T02:11:11Z

@thesahindia @MariaHCD One of you needs to 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]

MariaHCD

functionality to actually moderate these messages isn't quite there but this needs to go out soon.

Just wondering, is the backend not set up yet? And if so, why is the frontend going out first?

MariaHCD

Not a full review, just a few questions but will take a closer soon on Monday!

MariaHCD · 2023-05-26T13:02:44Z

src/pages/home/report/ReportActionItem.js

+            return;
+        }
+
+        // Right now we are only sending the latest moderationDecision to the frontend even though it is an array


Is this because any previous moderation decisions won't really be used in the frontend?

yep! We originally were just going to send them all because it was simpler for the backend, but this made a little more sense for JS.

src/pages/home/report/ReportActionItem.js

dangrous · 2023-05-26T14:26:09Z

Just wondering, is the backend not set up yet? And if so, why is the frontend going out first?

@MariaHCD So it's all in process, the actual flagging is set up in the backend but the ability for concierge to make the decisions on it isn't quite yet. Basically we're trying to get this out quickly (for Thursday) so pushing the pieces we can, when we can. Definitely not ideal, of course, but we'll get there!

thienlnam · 2023-05-26T17:33:16Z

src/pages/home/report/ReportActionItem.js

+    // Hide the message if it is being moderated for a higher offense, or is hidden by a moderator
+    // Removed messages should not be shown anyway and should not need this flow
+    useEffect(() => {
+        if (_.isEmpty(props.action.moderationDecisions)) {


Let's first check that it's an ADDCOMMENT report action and then update to check the message object like we talked about

thienlnam · 2023-05-26T17:35:19Z

src/pages/home/report/ReportActionItem.js

+            setIsHidden(true);
+        }
+        setModerationDecision(latestDecision.decision);
+    }, [props.action, moderationDecision]);


Can we check props.action.message so this doesn't re-render as much? Also it doesn't seem like we need to add a case for moderationDecision. It only changes when the prop.action.message changes, and then it would cause another run of this since the moderationDecision changed

yeah i agree on moderationDecision... but the linter did not haha. I'll see if switching over to the right format for the message object fixes that.

thienlnam

Great - thanks!

thienlnam · 2023-05-26T20:29:19Z

@thesahindia Could you please do a code review for this and verify it doesn't break the existing app reportActions?

MariaHCD · 2023-05-29T06:16:03Z

src/pages/home/report/ReportActionItem.js

+    // Hide the message if it is being moderated for a higher offense, or is hidden by a moderator
+    // Removed messages should not be shown anyway and should not need this flow
+    useEffect(() => {
+        if (!props.action.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT || _.isEmpty(props.action.message[0].moderationDecisions)) {


Suggested change

if (!props.action.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT || _.isEmpty(props.action.message[0].moderationDecisions)) {

if (props.action.actionName !== CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT || _.isEmpty(props.action.message[0].moderationDecisions)) {

NAB, it was just a bit confusing to read at first.

MariaHCD · 2023-05-29T06:16:58Z

src/pages/home/report/ReportActionItem.js

+
+        // Right now we are only sending the latest moderationDecision to the frontend even though it is an array
+        const latestDecision = props.action.message[0].moderationDecisions[0];
+        if (latestDecision.decision === CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE || latestDecision.decision === CONST.MODERATION.MODERATOR_DECISION_HIDDEN) {


Suggested change

if (latestDecision.decision === CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE || latestDecision.decision === CONST.MODERATION.MODERATOR_DECISION_HIDDEN) {

if (_.contains([CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE, CONST.MODERATION.MODERATOR_DECISION_HIDDEN], latestDecision.decision)) {

NAB

MariaHCD · 2023-05-29T06:19:46Z

Over to you, @thesahindia! :)

thesahindia · 2023-05-29T06:21:58Z

Will get to this in a few minutes.

thesahindia · 2023-05-29T09:25: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 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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

thesahindia

Works well!

I was wondering whether we should also disable some options (i.e reaction button) when we hide the message?
Also I noticed that when we open the thread for a hidden message, the message appears in the chat header, so should we hide the chat header text as well?

dangrous · 2023-05-30T13:31:45Z

I'm going to go ahead and merge this (for expendiency) and create a follow up PR to deal with the callouts that @thesahindia made (and the NABs from @MariaHCD )

OSBotify · 2023-05-30T13:39:30Z

✋ 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-05-31T17:22:02Z

🚀 Deployed to staging by https://github.com/dangrous in version: 1.3.21-0 🚀

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

OSBotify · 2023-06-01T03:04:32Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.21-2 🚀

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

s77rt · 2023-06-13T18:39:05Z

src/pages/home/report/ReportActionItem.js

+                                style={styles.buttonSmallText}
+                                selectable={false}
+                            >
+                                {isHidden ? 'Reveal message' : 'Hide message'}


You forgot to translate this which caused a regression #20090

Yep, saw that one when it happened... I changed it in one of the places it appears but not the other one. Thanks!

mollfpr · 2023-07-12T15:41:59Z

src/pages/home/report/ReportActionItem.js

+            setIsHidden(true);
+        }
+        setModerationDecision(latestDecision.decision);
+    }, [props.action.message, props.action.actionName]);


✋ Coming from #20810

We're interested in the value of moderationDecisions[0].decision. We should change the dependency of the effect.

makes sense! we are also eventually switching this to only ever have one moderation decision, so we won't need this, but the fix in #20810 is great for now

rushatgabhane · 2023-08-02T16:26:33Z

src/pages/home/report/ReportActionItem.js

@@ -105,6 +106,8 @@ const defaultProps = {

 function ReportActionItem(props) {
    const [isContextMenuActive, setIsContextMenuActive] = useState(ReportActionContextMenu.isActiveReportAction(props.action.reportActionID));
+    const [isHidden, setIsHidden] = useState(false);
+    const [moderationDecision, setModerationDecision] = useState(CONST.MODERATION.MODERATOR_DECISION_APPROVED);


Hi, we missed a small offline edge case in this PR - #20946

On deleting a hidden message, the reveal message button should have been removed too.
More details here #20946 (comment)

Santhosh-Sellavel · 2023-08-10T03:09:35Z

src/pages/home/report/ReportActionItem.js

+        // Right now we are only sending the latest moderationDecision to the frontend even though it is an array
+        const latestDecision = props.action.message[0].moderationDecisions[0];
+        if (latestDecision.decision === CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE || latestDecision.decision === CONST.MODERATION.MODERATOR_DECISION_HIDDEN) {
+            setIsHidden(true);


We fail to set a hidden false case here which causes a regression #22024 , For more details refer this proposal

dangrous added 2 commits May 23, 2023 12:44

basic framework

783b4b6

clean up visuals

535c054

dangrous self-assigned this May 23, 2023

dangrous added 3 commits May 23, 2023 14:51

cleanup

f831821

update to use hasBeenFlagged

26b7345

fix setting of flag state

70c4c18

dangrous changed the title ~~[WIP] Handle Moderated Messages in UI~~ [HOLD] Handle Moderated Messages in UI May 23, 2023

dangrous added the Waiting for copy User facing verbiage needs polishing label May 25, 2023

dangrous added 2 commits May 25, 2023 13:44

adapt to only sending one moderationDecision from backend

5359e45

add translations of copy

d42b150

thienlnam requested changes May 25, 2023

View reviewed changes

dangrous added 6 commits May 25, 2023 21:11

Merge branch 'main' into dangrous-handlemoderatedmessages

801b9d0

Merge branch 'main' into dangrous-handlemoderatedmessages

a381211

use constants for decisions

f49a93e

fix constant and prettier

b5083ee

act normal for pending

b104d9b

remove unnecessary conditional

5e9a8c8

dangrous removed the Waiting for copy User facing verbiage needs polishing label May 26, 2023

dangrous changed the title ~~[HOLD] Handle Moderated Messages in UI~~ [No QA] Handle Moderated Messages in UI May 26, 2023

add proptype comment

e97ac5d

dangrous marked this pull request as ready for review May 26, 2023 02:10

dangrous requested a review from a team as a code owner May 26, 2023 02:10

melvin-bot bot requested review from MariaHCD and thesahindia and removed request for a team May 26, 2023 02:11

MariaHCD reviewed May 26, 2023

View reviewed changes

thienlnam requested changes May 26, 2023

View reviewed changes

dangrous mentioned this pull request May 26, 2023

Create FlagCommentPage #19412

Merged

57 tasks

address comments

097ad8a

thienlnam previously approved these changes May 26, 2023

View reviewed changes

prettier seriously?

9bc5cd8

dangrous dismissed thienlnam’s stale review via 9bc5cd8 May 26, 2023 21:02

thienlnam approved these changes May 26, 2023

View reviewed changes

MariaHCD approved these changes May 29, 2023

View reviewed changes

thesahindia approved these changes May 29, 2023

View reviewed changes

dangrous merged commit 619a529 into main May 30, 2023

dangrous deleted the dangrous-handlemoderatedmessages branch May 30, 2023 13:31

OSBotify mentioned this pull request May 31, 2023

Deploy Checklist: New Expensify 2023-05-31 #19896

Closed

37 tasks

melvin-bot bot mentioned this pull request Jun 1, 2023

[HOLD for payment 2023-06-08] [Moderation] Handle Flagged Messages in UI #18509

Closed

s77rt reviewed Jun 13, 2023

View reviewed changes

s77rt mentioned this pull request Jun 13, 2023

[HOLD for payment 2023-06-19] [$1000] Reveal message is in english if changed language to spanish #20090

Closed

6 tasks

dangrous mentioned this pull request Jul 3, 2023

Clean up latestDecision conditionals #22141

Merged

57 tasks

thesahindia mentioned this pull request Jul 5, 2023

[HOLD for payment 2023-07-24] [$1000] Web - Thread report and LHN title still visible after thread parent message being flagged as Intimidation or Bullying #21890

Closed

6 tasks

mollfpr reviewed Jul 12, 2023

View reviewed changes

mollfpr mentioned this pull request Jul 12, 2023

[HOLD for payment 2023-07-12] [$1000] Web - Chat - Flagged attachment are collapsed when reacted with emojis #20810

Closed

6 tasks

rushatgabhane reviewed Aug 2, 2023

View reviewed changes

rushatgabhane mentioned this pull request Aug 2, 2023

[Awaiting Checklist Completion] [$1000] Web - The reveal /hide button text is cut off in offline mode and doesn't disappears dynamically #20946

Closed

6 tasks

Santhosh-Sellavel reviewed Aug 10, 2023

View reviewed changes

Santhosh-Sellavel mentioned this pull request Aug 10, 2023

[HOLD for payment 2023-08-07] [$1000] Approved Hidden Comment Displays Incorrectly Until Refresh #22024

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[No QA] Handle Moderated Messages in UI #19476

[No QA] Handle Moderated Messages in UI #19476

dangrous commented May 23, 2023 •

edited

Loading

melvin-bot bot commented May 26, 2023

MariaHCD left a comment

MariaHCD left a comment

MariaHCD May 26, 2023

dangrous May 26, 2023

dangrous commented May 26, 2023

thienlnam May 26, 2023

thienlnam May 26, 2023

dangrous May 26, 2023

thienlnam left a comment

thienlnam commented May 26, 2023

MariaHCD May 29, 2023

MariaHCD May 29, 2023

MariaHCD commented May 29, 2023

thesahindia commented May 29, 2023

thesahindia commented May 29, 2023

thesahindia left a comment

dangrous commented May 30, 2023

OSBotify commented May 30, 2023

OSBotify commented May 31, 2023

OSBotify commented Jun 1, 2023

s77rt Jun 13, 2023

dangrous Jun 13, 2023

mollfpr Jul 12, 2023

dangrous Jul 12, 2023

dangrous Jul 12, 2023

rushatgabhane Aug 2, 2023 •

edited

Loading

Santhosh-Sellavel Aug 10, 2023

	if (!props.action.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT \|\| _.isEmpty(props.action.message[0].moderationDecisions)) {
	if (props.action.actionName !== CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT \|\| _.isEmpty(props.action.message[0].moderationDecisions)) {

	if (latestDecision.decision === CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE \|\| latestDecision.decision === CONST.MODERATION.MODERATOR_DECISION_HIDDEN) {
	if (_.contains([CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE, CONST.MODERATION.MODERATOR_DECISION_HIDDEN], latestDecision.decision)) {

[No QA] Handle Moderated Messages in UI #19476

[No QA] Handle Moderated Messages in UI #19476

Conversation

dangrous commented May 23, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 26, 2023

MariaHCD left a comment

Choose a reason for hiding this comment

MariaHCD left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dangrous commented May 26, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thienlnam left a comment

Choose a reason for hiding this comment

thienlnam commented May 26, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MariaHCD commented May 29, 2023

thesahindia commented May 29, 2023

thesahindia commented May 29, 2023

Reviewer Checklist

Screenshots/Videos

thesahindia left a comment

Choose a reason for hiding this comment

dangrous commented May 30, 2023

OSBotify commented May 30, 2023

OSBotify commented May 31, 2023

OSBotify commented Jun 1, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rushatgabhane Aug 2, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dangrous commented May 23, 2023 •

edited

Loading

rushatgabhane Aug 2, 2023 •

edited

Loading