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/34671: Grey out pending member in report #35883

Merged
merged 31 commits into from
Mar 8, 2024

Conversation

DylanDylann
Copy link
Contributor

@DylanDylann DylanDylann commented Feb 6, 2024

Details

Introduce new field called pendingVisibleChatMembers to grey out pending member in report

Fixed Issues

$ #34671
PROPOSAL: #34671 (comment)

Tests

Flow 1:

  1. Create a new workspace (called A)
  2. Disable the internet connection
  3. Invite new members to workspace A
  4. Go to Announce room of workspace A and go to Member Page
  5. Verify the newly added member is grayed out
  6. Create a manual room (Called B) and attach it to workspace A
  7. Go to the room B > Members
  8. Invite new members to room B
  9. Verify the newly added member is grayed out

Flow 2:

  1. Disable the internet connection
  2. Create a new workspace
  3. Go to admin room of the above workspace
  4. Go to member page
  5. Verify that the admin is greyed out
  • Verify that no errors appear in the JS console

Offline tests

Same above

QA Steps

Same above

  • 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 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 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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
pen-and.mp4
Android: mWeb Chrome
pen-ch.mp4
iOS: Native
pen-ios.mp4
iOS: mWeb Safari
pending-safari.mp4
MacOS: Chrome / Safari
grey-web.mp4
MacOS: Desktop
pending-desktop.mp4

@DylanDylann DylanDylann marked this pull request as ready for review February 6, 2024 15:10
@DylanDylann DylanDylann requested a review from a team as a code owner February 6, 2024 15:10
@melvin-bot melvin-bot bot requested review from getusha and removed request for a team February 6, 2024 15:10
Copy link

melvin-bot bot commented Feb 6, 2024

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

@getusha
Copy link
Contributor

getusha commented Feb 7, 2024

Crash when trying to open details of announce room while it is loading.

Screen.Recording.2024-02-07.at.1.48.13.PM.mov

@getusha
Copy link
Contributor

getusha commented Feb 7, 2024

Some places the invited member is not grayed out.

Screen.Recording.2024-02-07.at.1.52.02.PM.mov

@getusha
Copy link
Contributor

getusha commented Feb 8, 2024

@DylanDylann bump on the above.

@DylanDylann
Copy link
Contributor Author

I am checking

@DylanDylann
Copy link
Contributor Author

DylanDylann commented Feb 8, 2024

@getusha For your crash app bug. I also can reproduce on the staging so It isn't caused by my change

bug.mov

@DylanDylann
Copy link
Contributor Author

Some places the invited member is not grayed out.

For this bug, I missed updating pendingVisibleChatMembers for the workspace expense chat. I updated it, please help to check again

@DylanDylann
Copy link
Contributor Author

Please help to review the code change and test. I will upload the full screenshots soon,

src/libs/actions/Report.ts Outdated Show resolved Hide resolved
@DylanDylann
Copy link
Contributor Author

@getusha Updated full videos

@getusha
Copy link
Contributor

getusha commented Feb 11, 2024

@DylanDylann Thanks, testing...

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved
@DylanDylann
Copy link
Contributor Author

@getusha Updated

@DylanDylann
Copy link
Contributor Author

@getusha I tested again so carefully on mWeb(Chrome) and Android and I didn't see any bug. Could you help to clear the ONYX (log out) and test again?

@DylanDylann
Copy link
Contributor Author

@getusha Merged main and resolved conflict

Copy link
Contributor

@getusha getusha left a comment

Choose a reason for hiding this comment

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

Just few minor comments @DylanDylann

src/pages/RoomMembersPage.tsx Outdated Show resolved Hide resolved
src/pages/RoomMembersPage.tsx Outdated Show resolved Hide resolved
src/pages/ReportParticipantsPage.tsx Outdated Show resolved Hide resolved
DylanDylann and others added 3 commits March 5, 2024 00:21
Co-authored-by: Getabalew Tesfaye <75031127+getusha@users.noreply.github.com>
Co-authored-by: Getabalew Tesfaye <75031127+getusha@users.noreply.github.com>
@DylanDylann
Copy link
Contributor Author

@getusha Updated

@melvin-bot melvin-bot bot requested a review from flodnv March 6, 2024 09:33
Copy link
Contributor

@flodnv flodnv left a comment

Choose a reason for hiding this comment

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

Did we test a pending admin in the #admins room?

src/types/onyx/Report.ts Show resolved Hide resolved
src/types/onyx/Report.ts Outdated Show resolved Hide resolved
@DylanDylann
Copy link
Contributor Author

@flodnv

Did we test a pending admin in the #admins room?

Do you mean the case that we create workspace offline and we expect the admin member in the admin room to be greyed out?

@flodnv
Copy link
Contributor

flodnv commented Mar 7, 2024

@DylanDylann yes

@DylanDylann
Copy link
Contributor Author

@flodnv Updated to cover pending members for admin room. Note that when deleting the workspace we can't access to member page of the admin room, so we don't need to update pending members for the admin room in this case

Screen.Recording.2024-03-08.at.14.10.59.mov

cc @getusha

@flodnv
Copy link
Contributor

flodnv commented Mar 8, 2024

Sweet, thanks! Can you please update tests/QA steps in the PR description accordingly? 🙇

@flodnv flodnv merged commit 401bb21 into Expensify:main Mar 8, 2024
15 checks passed
@DylanDylann
Copy link
Contributor Author

Updated. Thanks

@OSBotify
Copy link
Contributor

OSBotify commented Mar 8, 2024

✋ 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
Copy link
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.50-5 🚀

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

@@ -183,6 +183,7 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) {
return;
}
}
const pendingChatMember = report?.pendingChatMembers?.find((member) => member.accountID === accountID.toString());
Copy link
Contributor

Choose a reason for hiding this comment

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

Hi coming from #38821

The issue is the deleted member offline didn't get strikethrough because we didn't get the last pendingChatMembers.

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.

5 participants