Skip to content

Conversation

@aldo-expensify
Copy link
Contributor

@aldo-expensify aldo-expensify commented Jun 16, 2023

Fixes regression from: #20223

When the reported action is the only action, we ended up returning the text of the report action with type CREATED. Normally we ignore this action and the new code wasn't ignoring it.

Details

Fixed Issues

$ #20940
PROPOSAL: GH_LINK_ISSUE(COMMENT)

Tests "FAKE"

  1. Create a chat between two accounts
  2. Send a SINGLE message from account A to account B
  3. With account B, flag the message as harassment
  4. Verify that the LHN shows "This is the beginning of your chat with concierge" and not "FAKE"

Tests - last report message incorrect without opening the report

  1. Flag the last message of a conversation
  2. Go to another report
  3. Log out / log in
  4. Don't open the report where you flagged the message!
  5. Verify that the flagged message doesn't appear as the last message of the report

Tests - Group

  1. Create a group with accounts A and B
  2. Send a message with account A
  3. Send a message with account B
  4. With account A, flag the message sent by account B
  5. Verify that the last message shown in the LHN shows the correct author (account A) and the correct message text.

Tests - Task

  1. Create a task for account B using account A
  2. Send a message with account B
  3. Flag the message with account A
  4. Verify that the LHN last message is correct

Tests - Offline

  1. In a chat with account A and account B, send a message with account A
  2. Go offline
  3. Using account B, flag the message as harassment
  4. Check that the optimistic last message in the LHN is correct
  5. Go online and check that everything is fine

Tests - error (only if you can manipulate the PHP API)

  1. Add a throw at the start of the try block (here)
  2. In a chat with account A and account B, send a message with account A
  3. Using account B, flag the message as harassment
  4. Check that there is an error and that the LHN last message is reverted to the message we were not able to flag
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android / native
    • Android / Chrome
    • iOS / native
    • iOS / Safari
    • MacOS / Chrome / Safari
    • MacOS / Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web image
Mobile Web - Chrome
Mobile Web - Safari
Desktop
iOS
Android

@aldo-expensify aldo-expensify requested a review from a team as a code owner June 16, 2023 21:34
@aldo-expensify aldo-expensify self-assigned this Jun 16, 2023
@melvin-bot melvin-bot bot requested review from eVoloshchak and removed request for a team June 16, 2023 21:34
@melvin-bot
Copy link

melvin-bot bot commented Jun 16, 2023

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

@github-actions
Copy link
Contributor

⚠️ ⚠️ Heads up! This pull request has the CP Staging label ⚠️ ⚠️
If you applied the CP Staging label before the PR was merged, the PR will be be immediately deployed to staging even if the open StagingDeployCash deploy checklist is locked.
However if you applied the CP Staging after the PR was merged it's possible it won't be CP'ed automatically. If you need it to be CP'ed to staging, tag a member of @Expensify/mobile-deployers to CP it manually, otherwise you can wait for it to go out with the next deploy.

@aldo-expensify aldo-expensify requested a review from thienlnam June 16, 2023 21:43
Copy link
Contributor

@neil-marcellini neil-marcellini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing my mistake!

@aldo-expensify
Copy link
Contributor Author

@neil-marcellini no problem! I removed some unnecessary || {} from the code, can you re-approve? 🙏

@aldo-expensify
Copy link
Contributor Author

@eVoloshchak are you online now to review this?

thienlnam
thienlnam previously approved these changes Jun 16, 2023
@aldo-expensify aldo-expensify requested review from allroundexperts and thienlnam and removed request for eVoloshchak June 16, 2023 23:00
@allroundexperts
Copy link
Contributor

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

@allroundexperts
Copy link
Contributor

@aldo-expensify The LHN does not show No activity yet instantly. I think it shows that only when it receives the data from pusher. Is that expected?

Screen.Recording.2023-06-17.at.4.24.57.AM.mov

@aldo-expensify
Copy link
Contributor Author

@aldo-expensify The LHN does not show No activity yet instantly. I think it shows that only when it receives the data from pusher. Is that expected?

That sounds like a good guess to me, maybe we need better optimistic data to show it instantly. Having said that, I would consider that unrelated and leave it for a follow up if we want to improve it.

cc @neil-marcellini

@allroundexperts
Copy link
Contributor

Also, it does not seem to work if you're offline.

Screen.Recording.2023-06-17.at.4.28.05.AM.mov

@aldo-expensify
Copy link
Contributor Author

Also, it does not seem to work if you're offline.

Screen.Recording.2023-06-17.at.4.28.05.AM.mov

Yeah, I think that points to the same think mentioned in your other comment, we are probably not flagging the comment optimistically and we wait to receive it in the response or in the pusher. I think that can be improved, but that is not related to the deploy blocker.

@aldo-expensify
Copy link
Contributor Author

Good thinking in testing with threads, I didn't think about that.

luacmartins
luacmartins previously approved these changes Jun 20, 2023
Copy link
Contributor

@neil-marcellini neil-marcellini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests "FAKE"
Not passing for me. The last message shows a whisper. I pulled the latest from Auth, and rebuilt and restarted it before testing.

Screen.Recording.2023-06-20.at.11.57.42.AM.mov

Unrelated bug, probably on main, maybe dev only?

  1. Sign in with an account A and create a chat with a new user example@expensifail.com
  2. On another device attempt to login as that user

Expected result: The user is prompted for the magic code
Actual result: An error is displayed Cannot get account details, please try again or contact concierge@expensify.com

@aldo-expensify
Copy link
Contributor Author

Unrelated bug, probably on main, maybe dev only?

  1. Sign in with an account A and create a chat with a new user example@expensifail.com
  2. On another device attempt to login as that user

Expected result: The user is prompted for the magic code Actual result: An error is displayed Cannot get account details, please try again or contact concierge@expensify.com

Yes, unrelated. I think this is the same I reported here: https://expensify.slack.com/archives/C049HHMV9SM/p1686949198475289

@aldo-expensify
Copy link
Contributor Author

Tests "FAKE"
Not passing for me. The last message shows a whisper. I pulled the latest from Auth, and rebuilt and restarted it before testing.

Oh, I think I saw once this one... My suspicion is that there is an onyx update we push with the concierge message as the last message for the report. I'm guessing that needs a fix in Web-E. I didn't see this case much because my pusher events sometimes don't work in dev.

I don't think we should hold this App PR on that as that involves a fix in Web-E.

@neil-marcellini
Copy link
Contributor

Since I made commits on this PR it would be best for me not to review.

@neil-marcellini neil-marcellini dismissed their stale review June 20, 2023 21:08

Since I made commits on this PR it would be best for me not to review.

@luacmartins
Copy link
Contributor

This is no longer a blocker, so removing the CP staging label.

@aldo-expensify

This comment was marked as off-topic.

Copy link
Contributor

@thienlnam thienlnam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@allroundexperts Are you able to run through the checklist for this?

@thienlnam thienlnam requested review from neil-marcellini and removed request for neil-marcellini June 21, 2023 17:46
@aldo-expensify
Copy link
Contributor Author

@allroundexperts Are you able to run through the checklist for this?

There is a another PR needed in the backend because we are still sending as a pusher event the Concierge whisper as the last report message. If @allroundexperts tests now, the pusher event will make it hard to see that the App is working fine and that there is just a problem in the backend.

@thienlnam
Copy link
Contributor

thienlnam commented Jun 21, 2023

Ah gotcha, nvm then I thought this was good to go from this comment - could you please put hold in the title then until we get the backend PR merged?

@aldo-expensify aldo-expensify changed the title Don't use CREATED action as last message for LHN [HOLD] Don't use CREATED action as last message for LHN Jun 21, 2023
@allroundexperts
Copy link
Contributor

Hi guys!

Is the backend PR still not merged?

@aldo-expensify
Copy link
Contributor Author

Sorry, not yet, the PR was not reviewed for a long time, ran into conflicts and now some tests are failing

@aldo-expensify
Copy link
Contributor Author

https://github.com/Expensify/Web-Expensify/pull/37910 is in staging, I'll start working on resolving conflicts + retesting.

@aldo-expensify aldo-expensify marked this pull request as draft July 18, 2023 21:42
@aldo-expensify
Copy link
Contributor Author

Worked on the conflicts, but I have to retest everything. Resolving conflicts I saw that some changes I was doing here were already done in main, so I'll go through the list of cases we had and check what is the state for them.

@aldo-expensify
Copy link
Contributor Author

I'm going to close this, the original issue seems to be fixed and this is full of conflicts. If there is something to do, we should do it in a fresh new PR.

cc @neil-marcellini since I think you needed some changes from here, but maybe you already implemented them

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants