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.

Sign up for GitHub

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

Jump to bottom

[FIX] user status Offline misnamed as Invisible in Custom Status edit dropdown menu #24796

Merged
merged 7 commits into from
Jun 5, 2022
Merged

[FIX] user status Offline misnamed as Invisible in Custom Status edit dropdown menu #24796

merged 7 commits into from
Jun 5, 2022

Conversation

Kunalvrm555
Copy link
Contributor

@Kunalvrm555 Kunalvrm555 commented Mar 10, 2022 •
edited by dougfabris
Loading

Proposed changes (including videos or screenshots)

BEFORE :

2022-03-08.21-44-58.mp4

AFTER :

2022-03-08.21-46-08.mp4

Issue(s)

Closes #24742

Steps to test or reproduce

debdutdeb
debdutdeb previously approved these changes Mar 10, 2022
View reviewed changes
@Kunalvrm555
Copy link
Contributor Author

Kindly consider merging this PR @tassoevan @dougfabris
Thanks !

@debdutdeb
Copy link
Member

@Kunalvrm555 - looks like a conflict has come to be, can you please resolve this one?

@Kunalvrm555
Copy link
Contributor Author

@Kunalvrm555 - looks like a conflict has come to be, can you please resolve this one?

It is showing that the conflicts are too complex to be resolved in web editor. These conflicts appeared recently, and weren't there when I opened this PR.
I don't understand, please suggest a way out @debdutdeb

@debdutdeb
Copy link
Member

We had a recent rewrite of this file done, where, I may have left this unfixed 😉 mind changing this PR to fix that?

Ref: https://github.com/RocketChat/Rocket.Chat/pull/25265/files

@Kunalvrm555
Copy link
Contributor Author

We had a recent rewrite of this file done, where, I may have left this unfixed 😉 mind changing this PR to fix that?

Ref: https://github.com/RocketChat/Rocket.Chat/pull/25265/files

hey @debdutdeb, fixed it.
Please have a look

@debdutdeb
Copy link
Member

Ok, no. You're not changing the right file. It's no longer in client but in apps/meteor/client. You missed a step when resolving the conflicts. Do a simple git mv and it should then be fine.

@debdutdeb
Copy link
Member

debdutdeb commented May 12, 2022 •
edited
Loading

basically git mv client/components/UserStatusMenu.tsx apps/meteor/client/components/UserStatusMenu.tsx - and commit & push. (don't copy paste, I can have spelling or other mistakes)

@Kunalvrm555
Copy link
Contributor Author

Ok, no. You're not changing the right file. It's no longer in client but in apps/meteor/client. You missed a step when resolving the conflicts. Do a simple git mv and it should then be fine.

my bad, missed it.
I'l fix that. Thanks for the help 😅

@debdutdeb
Copy link
Member

Hm it's also not up to date :/ @Kunalvrm555 - let me fix this please. I'll let you know exactly what I did so that you can follow later on.

@Kunalvrm555
Copy link
Contributor Author

Kunalvrm555 commented May 12, 2022 •
edited
Loading

Hm it's also not up to date :/ @Kunalvrm555 - let me fix this please. I'll let you know exactly what I did so that you can follow later on.

that'd be great. sorry for the trouble @debdutdeb

@Kunalvrm555 Kunalvrm555 requested a review from a team as a code owner May 12, 2022 18:24
@debdutdeb
Copy link
Member

No worries haha! happens. I actually didn't have to do anything else but just move the file to correct location (the command I showed above). I misread one line in the previous commit, so ignore the "not up to date" comment.

@Kunalvrm555
Copy link
Contributor Author

Kunalvrm555 commented May 12, 2022 •
edited
Loading

No worries haha! happens. I actually didn't have to do anything else but just move the file to correct location (the command I showed above). I misread one line in the previous commit, so ignore the "not up to date" comment.

Thank you very much 😇
Is there anything else that needs to be done now at my end in order to merge this PR ?

@debdutdeb
Copy link
Member

No, just waiting for all checks to turn green before approving.

@debdutdeb debdutdeb added this to the 4.8.0 milestone May 19, 2022
@d-gubert d-gubert modified the milestones: 4.8.0, 4.9.0 May 24, 2022
@debdutdeb debdutdeb merged commit 881e762 into RocketChat:develop Jun 5, 2022
gabriellsh added a commit that referenced this pull request Jun 6, 2022
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into fix/…
2a75a00 
…message-body

* 'develop' of github.com:RocketChat/Rocket.Chat:
  [IMPROVE] Refactor + unit tests for federation-v2 (#25680)
  [FIX] user status Offline misnamed as Invisible in Custom Status edit dropdown menu (#24796)
  Chore: Messages raw model rewrite to ts (#25761)
  Chore: migrate katex to ts (#25501)
  Chore: AutoTranslate contextualBar rewrite  (#25751)
  Chore: Replace AnnouncementModal in favor of GenericModal (#25752)
  Chore: Keyboard shortcuts contextualBar rewrite (#25753)
  Chore: Prune Messages contextualBar rewrite (#25757)
  Chore: add Ajv JSON Schema to api/v1 (#25601)
  Update package.json (#25755)
  Update CODEOWNERS
  Chore: remove duplicated NotFoundPage.js (#25749)
gabriellsh added a commit that referenced this pull request Jun 6, 2022
@gabriellsh
Merge remote-tracking branch 'origin/develop' into new/homepage
e990729 
* origin/develop: (45 commits)
  [FIX] Thread Message Preview (#25709)
  [FIX] Bump meteor-node-stubs to version 1.2.3 (#25669)
  [IMPROVE] Refactor + unit tests for federation-v2 (#25680)
  [FIX] user status Offline misnamed as Invisible in Custom Status edit dropdown menu (#24796)
  Chore: Messages raw model rewrite to ts (#25761)
  Chore: migrate katex to ts (#25501)
  Chore: AutoTranslate contextualBar rewrite  (#25751)
  Chore: Replace AnnouncementModal in favor of GenericModal (#25752)
  Chore: Keyboard shortcuts contextualBar rewrite (#25753)
  Chore: Prune Messages contextualBar rewrite (#25757)
  Chore: add Ajv JSON Schema to api/v1 (#25601)
  Update package.json (#25755)
  Update CODEOWNERS
  Chore: remove duplicated NotFoundPage.js (#25749)
  Chore: command's endpoints (#25630)
  Chore: Fix incorrect checksum for agenda package (cause of breaking develop builds) (#25741)
  Chore: Remove duplicate checksumBehavior key from yarn file (#25730)
  [FIX] Custom emoji reaction size (#25393)
  Chore: Test for department screen (#25696)
  Chore: Taking out Blaze from routes with `MainLayout`  (#25697)
  ...
gabriellsh added a commit that referenced this pull request Jun 6, 2022
@gabriellsh
Merge remote-tracking branch 'origin/develop' into fix/attachmentMargin
1beda48 
* origin/develop: (26 commits)
  [FIX] Thread Message Preview (#25709)
  [FIX] Bump meteor-node-stubs to version 1.2.3 (#25669)
  [IMPROVE] Refactor + unit tests for federation-v2 (#25680)
  [FIX] user status Offline misnamed as Invisible in Custom Status edit dropdown menu (#24796)
  Chore: Messages raw model rewrite to ts (#25761)
  Chore: migrate katex to ts (#25501)
  Chore: AutoTranslate contextualBar rewrite  (#25751)
  Chore: Replace AnnouncementModal in favor of GenericModal (#25752)
  Chore: Keyboard shortcuts contextualBar rewrite (#25753)
  Chore: Prune Messages contextualBar rewrite (#25757)
  Chore: add Ajv JSON Schema to api/v1 (#25601)
  Update package.json (#25755)
  Update CODEOWNERS
  Chore: remove duplicated NotFoundPage.js (#25749)
  Chore: command's endpoints (#25630)
  Chore: Fix incorrect checksum for agenda package (cause of breaking develop builds) (#25741)
  Chore: Remove duplicate checksumBehavior key from yarn file (#25730)
  [FIX] Custom emoji reaction size (#25393)
  Chore: Test for department screen (#25696)
  Chore: Taking out Blaze from routes with `MainLayout`  (#25697)
  ...
@Kunalvrm555 Kunalvrm555 deleted the my-patch-1 branch June 9, 2022 13:08
@murtaza98 murtaza98 mentioned this pull request Jul 21, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dougfabris dougfabris dougfabris approved these changes

@debdutdeb debdutdeb debdutdeb approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
5.0.0
Development

Successfully merging this pull request may close these issues.

Offline misnamed as Invisible in Custom User Status edit menu
4 participants
@Kunalvrm555 @debdutdeb @dougfabris @d-gubert