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

regression: disabled voip leaves empty section in the user menu #33521

Merged
merged 2 commits into from
Oct 11, 2024
Merged

regression: disabled voip leaves empty section in the user menu #33521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b77bfd4
fix: voip toggle empty sections being displayed when voip is disabled
aleksandernsilva Oct 9, 2024
49a8061
Merge branch 'develop' into regression/voip-section
kodiakhq[bot] Oct 10, 2024
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
10 changes: 4 additions & 6 deletions apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import React from 'react';
import UserMenuHeader from '../UserMenuHeader';
import { useAccountItems } from './useAccountItems';
import { useStatusItems } from './useStatusItems';
import { useVoipItems } from './useVoipItems';
import { useVoipItemsSection } from './useVoipItemsSection';

export const useUserMenu = (user: IUser) => {
const t = useTranslation();

const statusItems = useStatusItems();
const accountItems = useAccountItems();
const voipItems = useVoipItems();
const voipSection = useVoipItemsSection();

const logout = useLogout();
const handleLogout = useEffectEvent(() => {
Expand All @@ -37,15 +37,13 @@ export const useUserMenu = (user: IUser) => {
title: t('Status'),
items: statusItems,
},
{
items: voipItems,
},
voipSection,
{
title: t('Account'),
items: accountItems,
},
{
items: [logoutItem],
},
];
].filter((section) => section !== undefined);
};
34 changes: 18 additions & 16 deletions ...ent/sidebar/header/hooks/useVoipItems.tsx → ...ar/UserMenu/hooks/useVoipItemsSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useMutation } from '@tanstack/react-query';
import React, { useMemo } from 'react';
import { useTranslation } from 'react-i18next';

const useVoipItems = (): GenericMenuItemProps[] => {
export const useVoipItemsSection = (): { items: GenericMenuItemProps[] } | undefined => {
const { t } = useTranslation();
const dispatchToastMessage = useToastMessageDispatch();

Expand Down Expand Up @@ -45,23 +45,25 @@ const useVoipItems = (): GenericMenuItemProps[] => {

return useMemo(() => {
if (!isEnabled) {
return [];
return;
}

return [
{
id: 'toggle-voip',
icon: isRegistered ? 'phone-disabled' : 'phone',
disabled: !isReady || toggleVoip.isLoading,
onClick: () => toggleVoip.mutate(),
content: (
<Box is='span' title={tooltip}>
{isRegistered ? t('Disable_voice_calling') : t('Enable_voice_calling')}
</Box>
),
},
];
return {
items: [
{
id: 'toggle-voip',
icon: isRegistered ? 'phone-disabled' : 'phone',
disabled: !isReady || toggleVoip.isLoading,
onClick: () => toggleVoip.mutate(),
content: (
<Box is='span' title={tooltip}>
{isRegistered ? t('Disable_voice_calling') : t('Enable_voice_calling')}
</Box>
),
},
],
};
}, [isEnabled, isRegistered, isReady, tooltip, t, toggleVoip]);
};

export default useVoipItems;
export default useVoipItemsSection;
10 changes: 4 additions & 6 deletions apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import React from 'react';
import UserMenuHeader from '../UserMenuHeader';
import { useAccountItems } from './useAccountItems';
import { useStatusItems } from './useStatusItems';
import useVoipItems from './useVoipItems';
import { useVoipItemsSection } from './useVoipItemsSection';

export const useUserMenu = (user: IUser) => {
const t = useTranslation();

const statusItems = useStatusItems();
const accountItems = useAccountItems();
const voipItems = useVoipItems();
const voipItemsSection = useVoipItemsSection();

const logout = useLogout();
const handleLogout = useMutableCallback(() => {
Expand All @@ -37,15 +37,13 @@ export const useUserMenu = (user: IUser) => {
title: t('Status'),
items: statusItems,
},
{
items: voipItems,
},
voipItemsSection,
{
title: t('Account'),
items: accountItems,
},
{
items: [logoutItem],
},
];
].filter((section) => section !== undefined);
};
34 changes: 17 additions & 17 deletions ...gsToolbar/UserMenu/hooks/useVoipItems.tsx → ...ebar/header/hooks/useVoipItemsSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useMutation } from '@tanstack/react-query';
import React, { useMemo } from 'react';
import { useTranslation } from 'react-i18next';

export const useVoipItems = (): GenericMenuItemProps[] => {
export const useVoipItemsSection = (): { items: GenericMenuItemProps[] } | undefined => {
const { t } = useTranslation();
const dispatchToastMessage = useToastMessageDispatch();

Expand Down Expand Up @@ -45,23 +45,23 @@ export const useVoipItems = (): GenericMenuItemProps[] => {

return useMemo(() => {
if (!isEnabled) {
return [];
return;
}

return [
{
id: 'toggle-voip',
icon: isRegistered ? 'phone-disabled' : 'phone',
disabled: !isReady || toggleVoip.isLoading,
onClick: () => toggleVoip.mutate(),
content: (
<Box is='span' title={tooltip}>
{isRegistered ? t('Disable_voice_calling') : t('Enable_voice_calling')}
</Box>
),
},
];
return {
items: [
{
id: 'toggle-voip',
icon: isRegistered ? 'phone-disabled' : 'phone',
disabled: !isReady || toggleVoip.isLoading,
onClick: () => toggleVoip.mutate(),
content: (
<Box is='span' title={tooltip}>
{isRegistered ? t('Disable_voice_calling') : t('Enable_voice_calling')}
</Box>
),
},
],
};
}, [isEnabled, isRegistered, isReady, tooltip, t, toggleVoip]);
};

export default useVoipItems;
Loading