Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: restore report lastMessageText after resolve whisper msg #44764

Merged
merged 11 commits into from
Jul 31, 2024

Conversation

dominictb
Copy link
Contributor

Details

Fixed Issues

$ #43737
PROPOSAL: #43737 (comment)

Tests

  1. Create Workspace
  2. Go to #announce room
  3. Send a message "#room-1"
  4. Verify that system message "Heads up, room-1 doesn't exist yet. Do you want to create it ?" appears
  5. Click "Yes"
  6. Verify that system message disappears from chat history
  7. Take a look at #announce room in LHN

Verify that: System message "Heads up, room-1 doesn't exist yet. Do you want to create it ?" should be dismissed

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. Create Workspace
  2. Go to #announce room
  3. Send a message "#room-1"
  4. Verify that system message "Heads up, room-1 doesn't exist yet. Do you want to create it ?" appears
  5. Click "Yes"
  6. Verify that system message disappears from chat history
  7. Take a look at #announce room in LHN

Verify that: System message "Heads up, room-1 doesn't exist yet. Do you want to create it ?" should be dismissed

  • 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: mWeb Chrome
    • iOS: Native
    • iOS: mWeb 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 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 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 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
compressed_web.mov.mp4
MacOS: Desktop

Signed-off-by: dominictb <tb-dominic@outlook.com>
@dominictb dominictb requested a review from a team as a code owner July 3, 2024 07:51
@melvin-bot melvin-bot bot requested review from ishpaul777 and removed request for a team July 3, 2024 07:51
Copy link

melvin-bot bot commented Jul 3, 2024

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

@dominictb
Copy link
Contributor Author

Pls review first. I'll upload the evidence of other device later!

@ishpaul777
Copy link
Contributor

this looks good, but does this include fixes for all actionable whisper, it appears that it only fixes mention whispers 🤔

@dominictb
Copy link
Contributor Author

@ishpaul777 I'll need to check and get back to you later.

@dominictb
Copy link
Contributor Author

@ishpaul777
Copy link
Contributor

ishpaul777 commented Jul 8, 2024

I think, yeah that would be enough 👍

@dominictb
Copy link
Contributor Author

@ishpaul777 updated!

compressed_web.mov.mp4

@ishpaul777
Copy link
Contributor

We have conflicts @dominictb

@dominictb
Copy link
Contributor Author

@ishpaul777 updated!

@ishpaul777
Copy link
Contributor

@dominictb I have tested and it works great for room and mention whispers, but can we also include fix track expense whispers in PR, i believe it should it be straightforward, but let me know if you think otherwise ?

Screen.Recording.2024-07-12.at.1.06.28.AM.mov

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved
Signed-off-by: dominictb <tb-dominic@outlook.com>
Signed-off-by: dominictb <tb-dominic@outlook.com>
@dominictb
Copy link
Contributor Author

#44764 (comment)

@ishpaul777 we don't need to cover for self-dm track expense whisper message in this PR as my other PR #44684 has already got it covered. Thanks!

@dominictb
Copy link
Contributor Author

@ishpaul777 main is merged! This should contain the fix for the self-DM track expense whisper message as well. Thanks!

@ishpaul777
Copy link
Contributor

@dominictb Please fix conflict, i'll complete this today

@dominictb
Copy link
Contributor Author

@ishpaul777 done!

@ishpaul777
Copy link
Contributor

ishpaul777 commented Jul 17, 2024

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
Record_2024-07-18-00-03-52.mp4
Android: mWeb Chrome
Record_2024-07-17-23-54-34.mp4
iOS: Native
Screen.Recording.2024-07-17.at.11.46.33.PM.mov
Screen.Recording.2024-07-17.at.11.44.26.PM.mov
iOS: mWeb Safari
Screen.Recording.2024-07-17.at.11.37.40.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2024-07-18.at.12.45.25.AM.mov
MacOS: Desktop
Screen.Recording.2024-07-18.at.12.23.26.AM.mov

@ishpaul777
Copy link
Contributor

ishpaul777 commented Jul 17, 2024

It appears the whisper message reappears after couple minutes for mention whispers, i think this is also backend related @dominictb Can you please confirm?

Screenshot 2024-07-18 at 12 18 29 AM

@dominictb
Copy link
Contributor Author

@ishpaul777 yep, it's backend.

image

I did also mention this in my proposal.

Copy link
Contributor

@ishpaul777 ishpaul777 left a comment

Choose a reason for hiding this comment

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

LGTM!

Side note: we still need BE changes to make this work properly currently this can be tested in offline behaviour

@melvin-bot melvin-bot bot requested a review from Julesssss July 18, 2024 09:34
@Julesssss
Copy link
Contributor

It appears the whisper message reappears after couple minutes for mention whispers, i think this is also backend related @dominictb Can you please confirm?

Just to clarify, this always gets overwritten. Not only when logging out and back in?

@ishpaul777
Copy link
Contributor

yes

@Julesssss
Copy link
Contributor

Okay. So even with us being unable to resolve the backend issue anytime soon this is an improvement. I think we should merge then keep the issue open and mark as internal.

@strepanier03 does it sound okay to you? Hopefully we can find someone to make the backend fix, but I think it is unlikely to happen anytime soon.

@dominictb
Copy link
Contributor Author

@ishpaul777 @Julesssss this will happen whenever we call the OpenReport API again, e.g: Navigate away and back to the report screen,...

@ishpaul777
Copy link
Contributor

@strepanier03 gentle bump on #44764 (comment)

Copy link
Contributor

@ishpaul777
Copy link
Contributor

@dominictb we have conflicts

@dominictb
Copy link
Contributor Author

@ishpaul777 resolved

@dominictb
Copy link
Contributor Author

@Julesssss are we good to merge this?

@Julesssss
Copy link
Contributor

@Julesssss are we good to merge this?

Yeah, thanks for reminder

@Julesssss Julesssss merged commit 73ec7f8 into Expensify:main Jul 31, 2024
14 checks passed
@OSBotify
Copy link
Contributor

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

@ishpaul777
Copy link
Contributor

Note for QA: This can be tested in offline mode only for now.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.0.15-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Aug 2, 2024

🚀 Deployed to production by https://github.com/roryabraham in version: 9.0.15-9 🚀

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

@dominictb dominictb deleted the fix/43737-lhn-system-msg branch August 21, 2024 02:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants