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

Room settings-Members added/deleted in a room in offline mode are not grayed out/crossed #35355

Merged
merged 24 commits into from
Mar 20, 2024

Conversation

tienifr
Copy link
Contributor

@tienifr tienifr commented Jan 30, 2024

Details

Fixed Issues

$ #31764
PROPOSAL: #31764 (comment)

Tests

  1. Login with any account
  2. Open any room (or create it) -> Members
  3. Turn off the internet connection
  4. Invite some new members
  5. Delete some members
  6. Verify that members added offline are grayed out
  7. Verify that members removed offline are crossed out
  • Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

  1. Login with any account
  2. Open any room (or create it) -> Members
  3. Turn off the internet connection
  4. Invite some new members
  5. Delete some members
  6. Verify that members added offline are grayed out
  7. Verify that members removed offline are crossed out
  • 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
      • 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

Android: Native
Screen.Recording.2024-01-30.at.11.36.22.mov
Android: mWeb Chrome
Screen.Recording.2024-01-30.at.11.40.42.mov
iOS: Native
Screen.Recording.2024-01-30.at.11.22.02.mov
iOS: mWeb Safari
Screen.Recording.2024-01-30.at.11.04.08.mov
MacOS: Chrome / Safari
Screen.Recording.2024-01-30.at.10.54.04.mov
MacOS: Desktop
Screen.Recording.2024-01-30.at.11.09.12.mp4

@tienifr tienifr changed the title Fix/31764 Room settings-Members added/deleted in a room in offline mode are not grayed out/crossed Jan 30, 2024
@tienifr tienifr marked this pull request as ready for review January 30, 2024 04:16
@tienifr tienifr requested a review from a team as a code owner January 30, 2024 04:16
@melvin-bot melvin-bot bot requested review from alitoshmatov and removed request for a team January 30, 2024 04:16
Copy link

melvin-bot bot commented Jan 30, 2024

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

@tienifr
Copy link
Contributor Author

tienifr commented Feb 5, 2024

@alitoshmatov any updates?

@alitoshmatov
Copy link
Contributor

Will take a look today

@alitoshmatov
Copy link
Contributor

Sorry This one went under my radar, @tienifr I don't have access to expensifail account, is this required?

@alitoshmatov
Copy link
Contributor

alitoshmatov commented Feb 14, 2024

Bump @tienifr

@tienifr
Copy link
Contributor Author

tienifr commented Feb 15, 2024

@alitoshmatov Sorry for this delay. I'm back from holiday. Yah, we don't need expensifail account. I just removed it in steps

src/languages/es.ts Outdated Show resolved Hide resolved
people: {
error: {
genericAdd: 'There was a problem adding this room member.',
genericRemove: 'There was a problem removing that room member.',
Copy link
Contributor

Choose a reason for hiding this comment

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

This sounds a little bit of, especially that room member part. Did someone confirm this texts?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure if they're correct, I just copy the texts of workspace here. @deetergp Can you help confirm?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think what you have here is fine.

Copy link
Contributor

Choose a reason for hiding this comment

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

Actually, let's add the Waiting for copy label and get official @Expensify/marketing sign-off.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, I don't think the "Waiting for copy" label works on pull requests! It looks like this is for a generic error message and we can't drill down into more specific reasoning?

Copy link
Contributor

Choose a reason for hiding this comment

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

Also, where will these messages show up exactly and how will they look?

Not knowing much else, I'd suggest slight tweaks:

  • There was a problem adding this member to the room.
  • There was a problem removing this member from the room.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jamesdeanexpensify Thanks for your suggestion. What about Spanish?

Copy link
Contributor

Choose a reason for hiding this comment

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

Getting a check here.

Copy link
Contributor

Choose a reason for hiding this comment

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

This is already in the code it seems. I'm not an engineer, but an engineer confirmed it. @deetergp are you able to see the conversation here? Thanks!

@tienifr
Copy link
Contributor Author

tienifr commented Feb 20, 2024

@alitoshmatov I want to hear your feedbacks first, then I'll ask the translated text on Slack. Should we need to update the translation first?

@alitoshmatov
Copy link
Contributor

@tienifr Yes, I mean we need to confirm text for both languages

@tienifr
Copy link
Contributor Author

tienifr commented Feb 20, 2024

@deetergp deetergp added the Waiting for copy User facing verbiage needs polishing label Feb 21, 2024
@deetergp
Copy link
Contributor

@tienifr Just a heads up that you've got merge conflicts. Not sure if it's better to resolve them now wait till after marketing reviews the error copy.

@tienifr
Copy link
Contributor Author

tienifr commented Feb 22, 2024

@deetergp Fixed the conflicts

@deetergp
Copy link
Contributor

@tienifr @alitoshmatov Should we get an ES re-translation of the updated EN text? Also, there appear to be failing TypeScript checks.

@tienifr
Copy link
Contributor Author

tienifr commented Feb 23, 2024

@jamesdeanexpensify Can you help check the ES translation?

Copy link
Contributor

@alitoshmatov alitoshmatov left a comment

Choose a reason for hiding this comment

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

LGTM!

@melvin-bot melvin-bot bot requested a review from deetergp March 8, 2024 11:19
@deetergp
Copy link
Contributor

deetergp commented Mar 8, 2024

@tienifr Looks like you've collected a few merge conflicts. Once you sort those out, we'll get a final review in and ship this puppy 🚀

@tienifr
Copy link
Contributor Author

tienifr commented Mar 11, 2024

@deetergp @alitoshmatov This PR introduced other solution to fix the bug, so I need more time to resolve the conflict and re-test

@tienifr
Copy link
Contributor Author

tienifr commented Mar 12, 2024

@alitoshmatov I think the added/deleted room is fixed in this PR: #35883, we can revert these changes and just keep the fix for strike though bug. Wdyt?

@alitoshmatov
Copy link
Contributor

@tienifr I agree we should still apply strikethrough on delete because it is part of the main issue

@deetergp
Copy link
Contributor

It looks to me like strikethrough is already a part of #35883. Is there anything more to do here?

@tienifr
Copy link
Contributor Author

tienifr commented Mar 13, 2024

@deetergp The strikethrough bug still happens on main

web-resize.mp4

@tienifr
Copy link
Contributor Author

tienifr commented Mar 14, 2024

@deetergp wdyt about my comment above ^? Thanks

@deetergp
Copy link
Contributor

@tienifr Okay, if it's still broken on main even after #35883 was merged, let's go ahed and address it here. 👍

@tienifr
Copy link
Contributor Author

tienifr commented Mar 15, 2024

@alitoshmatov I just resolved the conflicts, can you help take a look at it? Thanks

@alitoshmatov
Copy link
Contributor

@tienifr It is still not working on me. Can you recheck

Screen.Recording.2024-03-17.at.3.41.54.PM.mov

@tienifr
Copy link
Contributor Author

tienifr commented Mar 18, 2024

@alitoshmatov we're removing the deleting member in removeFromRoom in optimistic data so in offline mode they're hidden. I just fixed it in removeFromRoom

web-resize.mp4

@alitoshmatov
Copy link
Contributor

I am just confused now with expected behavior here, are we 100% sure that strikethrough is expected behavior at this point?

@deetergp Can you confirm?

@tienifr
Copy link
Contributor Author

tienifr commented Mar 19, 2024

@alitoshmatov I believe it's the expected behavior since we have that logic in OfflineWithFeedback

Copy link
Contributor

@alitoshmatov alitoshmatov left a comment

Choose a reason for hiding this comment

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

Okay, code looks good to me, we can finally merge it. cc: @deetergp

Screen.Recording.2024-03-20.at.10.57.42.PM.mov

Copy link
Contributor

@deetergp deetergp left a comment

Choose a reason for hiding this comment

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

Code looks good and tested well for me on web. Thanks for seeing it through 👍

@deetergp deetergp merged commit 68a96ed into Expensify:main Mar 20, 2024
16 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.

@deetergp deetergp removed the Waiting for copy User facing verbiage needs polishing label Mar 20, 2024
@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/deetergp in version: 1.4.56-0 🚀

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

@tienifr
Copy link
Contributor Author

tienifr commented Mar 26, 2024

@kavimuru As the discussion here. It's not my regression

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.4.56-8 🚀

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

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