Skip to content

fix: Restore Away to quick status menu #41414

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

Merged
dionisio-bot merged 3 commits into from
Jul 18, 2026
Merged

fix: Restore Away to quick status menu #41414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92927ec
fix: Restore Away to quick status menu
ricardogarim Jul 16, 2026
62a26ae
Update apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks…
ricardogarim Jul 16, 2026
b14f55a
fix: initialize status forms to the user current status
ricardogarim Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/ready-taxis-join.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Restores Away as a selectable preset in the quick status menu, custom status modal, and account profile page.
9 changes: 2 additions & 7 deletions apps/meteor/client/components/UserStatusMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,16 @@ const UserStatusMenu = ({

const statuses: Array<[value: UserStatusType, label: ReactNode]> = [
[UserStatusType.ONLINE, renderOption(UserStatusType.ONLINE, t('Online'))],
[UserStatusType.AWAY, renderOption(UserStatusType.AWAY, t('Away'))],
[UserStatusType.BUSY, renderOption(UserStatusType.BUSY, t('Busy'))],
];

// Away is no longer manually selectable, but surface it if the user is currently on it
// (e.g., set in a previous version or auto-applied by the server) so they can switch off.
if (status === UserStatusType.AWAY) {
statuses.push([UserStatusType.AWAY, renderOption(UserStatusType.AWAY, t('Away'))]);
}

if (allowInvisibleStatus) {
statuses.push([UserStatusType.OFFLINE, renderOption(UserStatusType.OFFLINE, t('Offline'))]);
}

return statuses;
}, [t, allowInvisibleStatus, status]);
}, [t, allowInvisibleStatus]);

const [cursor, handleKeyDown, handleKeyUp, reset, [visible, hide, show]] = useCursor(-1, options, ([selected], [, hide]) => {
setStatus(selected);
Expand Down
3 changes: 1 addition & 2 deletions apps/meteor/client/lib/getUserInitialStatus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ export const getUserStatusInitialValues = (user: IUser | null, initialStatusText

return {
statusText: user?.statusText ?? initialStatusText ?? '',
statusType:
user?.status === UserStatusType.AWAY ? (user?.statusDefault ?? UserStatusType.ONLINE) : (user?.status ?? UserStatusType.ONLINE),
statusType: user?.status ?? UserStatusType.ONLINE,
statusDuration: initialExpiration ? 'custom' : '',
statusCustomDate: initialDate.toLocaleDateString('en-CA'),
statusCustomTime: initialDate.toTimeString().slice(0, 5),
Expand Down
5 changes: 1 addition & 4 deletions apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type { ICustomUserStatus, IUser } from '@rocket.chat/core-typings';
import { UserStatus as UserStatusEnum } from '@rocket.chat/core-typings';
import type { ICustomUserStatus, IUser, UserStatus as UserStatusEnum } from '@rocket.chat/core-typings';
import { Box, Icon, RadioButton } from '@rocket.chat/fuselage';
import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
import { clientCallbacks } from '@rocket.chat/ui-client';
Expand Down Expand Up @@ -131,12 +130,10 @@ export const useStatusItems = (user?: IUser): GenericMenuItemProps[] => {
});
}

// Presets: filter to Online / Busy / Offline. Keep Away only if user is currently on Away (legacy).
const isPresetSelected = (statusType: UserStatusEnum): boolean =>
!user?.statusText && !customStatusExpiration && user?.status === statusType;
const presetItems = (statuses ?? [])
.filter((s) => userStatuses.isValidType(s.id))
.filter((s) => s.statusType !== UserStatusEnum.AWAY || isPresetSelected(UserStatusEnum.AWAY))
.map(
(status): GenericMenuItemProps => ({
id: status.id,
Expand Down
Loading