Use a single moderationDecision instead of the moderationDecisions array #22852

dangrous · 2023-07-13T22:41:28Z

Details

Short version - right now we're using an array of decisions instead a single moderationDecision in it to the front end, due to switching directions partway through the project (we originally were sending the total moderation history). This causes problems with Onyx.merge (some funkiness and messy code required to handle optimistic updates), and it's simpler to handle the moderationDecision on its own, so that it will be replaced instead of added on. By the time this is in review, we send the single object through from Auth to Web-E to App so we should be all set.

Once this is deployed, we'll have one more set of PRs to remove the deprecated logic from Web-E and Auth. Technically this could pose some problems if people are using old App versions, but given the low usage of this feature I'm not super concerned. cc @thienlnam in case you have differing opinions.

Fixed Issues

N/A - General clean up of potential moderation bugs linked to sending an array.

Tests

[FOR INTERNAL TEAM ONLY] Same as QA with the addition of:
- Open Concierge locally to the Manifesto Tier
- Send another message (with any text, NOT MODERATION_TEST, and flag it as Intimidation
- You should receive the moderation request in Concierge
- Clear the flags on the message
- Verify that the message reappears as normal on both accounts.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Open any chat
Send the message "MODERATION_TEST" from one account
Flag the message as spam from the other account
Verify there is no visual change to the message on either account (getting whispers is fine)
Reflag the message as bullying
Verify the message is hidden on both accounts
Verify the "Reveal/Hide message" button works as expected
Reflag the message as assault
Verify the message is removed in both accounts

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Still struggling to get mWeb Chrome working, I'm resetting my device so we'll see.

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

dangrous · 2023-07-20T14:40:30Z

Almost ready, web-e is on staging

melvin-bot · 2023-07-21T14:27:11Z

@Santhosh-Sellavel 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]

Santhosh-Sellavel · 2023-07-21T20:08:18Z

Should we hold this for other PR-related moderation?

Santhosh-Sellavel · 2023-07-23T19:04:26Z

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 & Desktop

Screen.Recording.2023-07-24.at.12.22.20.AM.mov

Mobile Web - Chrome & Mobile Web - Safari

Screen.Recording.2023-07-25.at.2.21.01.AM.mov

iOS & Android

Screen.Recording.2023-07-25.at.2.08.20.AM.mov

Santhosh-Sellavel · 2023-07-23T19:08:33Z

@dangrous One question is this a bug?

Try flagging a message as SPAM
Verify There is no visual change to the message on either account (getting whispers is fine) ✅
Reflag the message as bullying
Verify the message is hidden on both accounts ✅
Verify the "Reveal/Hide message" button works as expected ✅
Reflag the message as SPAM
Messages reappeared and the hide/reveal option was hidden but back after a few seconds ✅ or ❌ ?

Screen.Recording.2023-07-24.at.12.33.41.AM.mov

Santhosh-Sellavel

Looks good just waiting for this #22852 (comment)

dangrous · 2023-07-24T14:27:44Z

i think that is an existing bug, but let me see if I can fix it here. (I have a note somewhere that says "Flagging as spam when already flagged as higher hides the 'reveal message' button very briefly" which I think is the same bug). The issue seems to be with the optimistic data still - since expected behavior is the end state (no change from when it was already flagged - and that's the updated data coming from the server.

dangrous · 2023-07-24T17:16:50Z

Updated! That bug should be fixed - i also cleaned up the logic a bit since it was unnecessarily complicated.

Santhosh-Sellavel · 2023-07-24T20:33:53Z

After flagging only comments in the thread LHN shows fake

Should I log a bug separately as this exists on the main too?

thienlnam · 2023-07-24T20:37:28Z

Adding myself as a reviewer for this issue since it's not linked to an existing one so pullerbear didn't pull one.

Would be great if we could resolve the above bug as well in this PR - I know we had the same problem with deleting the only comment in a chat report. I wonder if we could do the same here as well

Santhosh-Sellavel · 2023-07-24T20:43:17Z

@dangrous
Testing while offline, after clicking flag comment infinite loading in RHN, is this expected?

thienlnam · 2023-07-24T20:46:18Z

That does not look intended, you should be able to flag comments offline

Santhosh-Sellavel · 2023-07-24T20:49:27Z

Should I log a bug separately or will this be handled here?

Santhosh-Sellavel · 2023-07-24T20:54:11Z

IMO we should create follow-ups as both bugs are not caused here, let me know your thoughts thanks!
cc: @dangrous @thienlnam

dangrous · 2023-07-25T16:07:39Z

I will look into both of these! I think separate issues might make the most sense since they're not caused by this PR and contributors can likely work on both. But let me take a little bit of time and see if I can figure them out now.

dangrous · 2023-07-25T16:39:01Z

One down, one to go

dangrous · 2023-07-25T16:43:36Z

Let's actually move ahead with this PR, and add a separate issue for the loading while offline - it's not consistently reproducible (at least for me) so would need a bunch more investigation. It's definitely front end (so contributor friendly), and not directly related to this.

Santhosh-Sellavel · 2023-07-25T23:02:57Z

@dangrous Please resolve conflicts, thanks!

dangrous · 2023-07-27T14:27:34Z

Oops I thought I commented here yesterday. Conflicts resolved

Santhosh-Sellavel · 2023-07-27T14:54:35Z

Will look later today

Santhosh-Sellavel

LGTM, thanks!

melvin-bot · 2023-07-27T19:39:46Z

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

AndrewGable · 2023-07-27T20:51:57Z

Deferring review to @thienlnam

thienlnam

Awesome, thanks!

OSBotify · 2023-07-27T22:12:40Z

🚀 Deployed to staging by https://github.com/thienlnam in version: 1.3.47-1 🚀

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

OSBotify · 2023-07-31T18:34:33Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.3.47-6 🚀

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

OSBotify · 2023-08-02T01:24:48Z

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

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

OSBotify · 2023-08-03T18:17:15Z

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

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

first pass

feedc00

dangrous self-assigned this Jul 13, 2023

dangrous changed the title ~~[WIP] first pass~~ [Hold Web-E#38164] Use a single moderationDecision instead of the moderationDecisions array Jul 14, 2023

dangrous added 2 commits July 21, 2023 10:15

merge conflicts

24fbd01

better fix merge conflicts whoops

74b5845

dangrous changed the title ~~[Hold Web-E#38164] Use a single moderationDecision instead of the moderationDecisions array~~ Use a single moderationDecision instead of the moderationDecisions array Jul 21, 2023

dangrous marked this pull request as ready for review July 21, 2023 14:27

dangrous requested a review from a team as a code owner July 21, 2023 14:27

melvin-bot bot requested review from Santhosh-Sellavel and removed request for a team July 21, 2023 14:27

catch one more instance of moderationDecisions

488314a

Santhosh-Sellavel reviewed Jul 23, 2023

View reviewed changes

always set a moderationDecision

b51202f

thienlnam self-requested a review July 24, 2023 20:36

dangrous added 2 commits July 25, 2023 12:36

fix __FAKE__ in LHN

8373377

Merge branch 'main' into dangrous-objectmoderationdecisionnotarray

f78a276

dangrous added 2 commits July 26, 2023 11:48

merge conflicts

0c6cd56

prettier

189358b

Santhosh-Sellavel approved these changes Jul 27, 2023

View reviewed changes

melvin-bot bot requested a review from AndrewGable July 27, 2023 19:39

AndrewGable removed their request for review July 27, 2023 20:51

thienlnam approved these changes Jul 27, 2023

View reviewed changes

thienlnam merged commit 190f759 into main Jul 27, 2023

thienlnam deleted the dangrous-objectmoderationdecisionnotarray branch July 27, 2023 21:30

OSBotify mentioned this pull request Jul 27, 2023

Deploy Checklist: New Expensify 2023-07-27 #23765

Closed

79 tasks

dangrous mentioned this pull request Jul 31, 2023

[HOLD for payment 2023-08-07] Payment Issue for C+ Review #23952

Closed

OSBotify mentioned this pull request Aug 1, 2023

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

Closed

79 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use a single moderationDecision instead of the moderationDecisions array #22852

Use a single moderationDecision instead of the moderationDecisions array #22852

dangrous commented Jul 13, 2023 •

edited

Loading

dangrous commented Jul 20, 2023

melvin-bot bot commented Jul 21, 2023

Santhosh-Sellavel commented Jul 21, 2023

Santhosh-Sellavel commented Jul 23, 2023 •

edited

Loading

Santhosh-Sellavel commented Jul 23, 2023

Santhosh-Sellavel left a comment

dangrous commented Jul 24, 2023

dangrous commented Jul 24, 2023

Santhosh-Sellavel commented Jul 24, 2023

thienlnam commented Jul 24, 2023

Santhosh-Sellavel commented Jul 24, 2023

thienlnam commented Jul 24, 2023

Santhosh-Sellavel commented Jul 24, 2023

Santhosh-Sellavel commented Jul 24, 2023

dangrous commented Jul 25, 2023

dangrous commented Jul 25, 2023

dangrous commented Jul 25, 2023

Santhosh-Sellavel commented Jul 25, 2023

dangrous commented Jul 27, 2023

Santhosh-Sellavel commented Jul 27, 2023

Santhosh-Sellavel left a comment

melvin-bot bot commented Jul 27, 2023

AndrewGable commented Jul 27, 2023

thienlnam left a comment

OSBotify commented Jul 27, 2023

OSBotify commented Jul 31, 2023

OSBotify commented Aug 2, 2023

OSBotify commented Aug 3, 2023

Use a single moderationDecision instead of the moderationDecisions array #22852

Use a single moderationDecision instead of the moderationDecisions array #22852

Conversation

dangrous commented Jul 13, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

dangrous commented Jul 20, 2023

melvin-bot bot commented Jul 21, 2023

Santhosh-Sellavel commented Jul 21, 2023

Santhosh-Sellavel commented Jul 23, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

Santhosh-Sellavel commented Jul 23, 2023

Santhosh-Sellavel left a comment

Choose a reason for hiding this comment

dangrous commented Jul 24, 2023

dangrous commented Jul 24, 2023

Santhosh-Sellavel commented Jul 24, 2023

thienlnam commented Jul 24, 2023

Santhosh-Sellavel commented Jul 24, 2023

thienlnam commented Jul 24, 2023

Santhosh-Sellavel commented Jul 24, 2023

Santhosh-Sellavel commented Jul 24, 2023

dangrous commented Jul 25, 2023

dangrous commented Jul 25, 2023

dangrous commented Jul 25, 2023

Santhosh-Sellavel commented Jul 25, 2023

dangrous commented Jul 27, 2023

Santhosh-Sellavel commented Jul 27, 2023

Santhosh-Sellavel left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Jul 27, 2023

AndrewGable commented Jul 27, 2023

thienlnam left a comment

Choose a reason for hiding this comment

OSBotify commented Jul 27, 2023

OSBotify commented Jul 31, 2023

OSBotify commented Aug 2, 2023

OSBotify commented Aug 3, 2023

dangrous commented Jul 13, 2023 •

edited

Loading

Santhosh-Sellavel commented Jul 23, 2023 •

edited

Loading