diff --git a/packages/pl-fe/src/components/sidebar-navigation.tsx b/packages/pl-fe/src/components/sidebar-navigation.tsx index 38dbdc43d..93ef72856 100644 --- a/packages/pl-fe/src/components/sidebar-navigation.tsx +++ b/packages/pl-fe/src/components/sidebar-navigation.tsx @@ -257,7 +257,7 @@ const SidebarNavigation: React.FC = React.memo(({ shrink }) {features.chats && ( = ({ const account = status.account; getOrCreateChatByAccountId(account.id) - .then((chat) => navigate({ to: '/chats/$chatId', params: { chatId: chat.id } })) + .then((chat) => navigate({ to: '/chats/{-$chatId}', params: { chatId: chat.id } })) .catch(() => {}); }; @@ -1027,7 +1027,7 @@ const MenuButton: React.FC = ({ const isGroupAdmin = groupRelationship?.role === GroupRoles.ADMIN; // const isStatusFromOwner = group.owner.id === account.id; - const canBanUser = match?.isExact && (isGroupOwner || isGroupAdmin) && !ownAccount; + const canBanUser = match && (isGroupOwner || isGroupAdmin) && !ownAccount; const canDeleteStatus = !ownAccount && (isGroupOwner || isGroupAdmin); if (canBanUser || canDeleteStatus) { diff --git a/packages/pl-fe/src/components/thumb-navigation.tsx b/packages/pl-fe/src/components/thumb-navigation.tsx index 1c4eecfc3..2cd8c11a3 100644 --- a/packages/pl-fe/src/components/thumb-navigation.tsx +++ b/packages/pl-fe/src/components/thumb-navigation.tsx @@ -120,7 +120,7 @@ const ThumbNavigation: React.FC = React.memo((): JSX.Element => { src={require('@phosphor-icons/core/regular/chats-teardrop.svg')} activeSrc={require('@phosphor-icons/core/fill/chats-teardrop-fill.svg')} text={intl.formatMessage(messages.chats)} - to='/chats' + to='/chats/{-$chatId}' exact count={unreadChatsCount} countMax={9} diff --git a/packages/pl-fe/src/components/ui/column.tsx b/packages/pl-fe/src/components/ui/column.tsx index 42ec014b7..0d743a09e 100644 --- a/packages/pl-fe/src/components/ui/column.tsx +++ b/packages/pl-fe/src/components/ui/column.tsx @@ -8,7 +8,7 @@ import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; import { Card, CardBody, CardHeader, CardTitle, type CardSizes } from './card'; -type IColumnHeader = Pick; +type IColumnHeader = Pick; /** Contains the column title with optional back button. */ const ColumnHeader: React.FC = ({ label, backHref, backParams, className, action }) => { diff --git a/packages/pl-fe/src/features/account/components/header.tsx b/packages/pl-fe/src/features/account/components/header.tsx index ccd3a800f..95ad7fc40 100644 --- a/packages/pl-fe/src/features/account/components/header.tsx +++ b/packages/pl-fe/src/features/account/components/header.tsx @@ -170,7 +170,7 @@ const Header: React.FC = ({ account }) => { toast.error(data?.error); }, onSuccess: (response) => { - navigate({ to: '/chats/$chatId', params: { chatId: response.id } }); + navigate({ to: '/chats/{-$chatId}', params: { chatId: response.id } }); queryClient.invalidateQueries({ queryKey: ['chats', 'search'], }); diff --git a/packages/pl-fe/src/features/chats/components/chat-list-item.tsx b/packages/pl-fe/src/features/chats/components/chat-list-item.tsx index 74c324e0b..8451ab7ad 100644 --- a/packages/pl-fe/src/features/chats/components/chat-list-item.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-list-item.tsx @@ -59,7 +59,7 @@ const ChatListItem: React.FC = ({ chat, onClick }) => { deleteChat.mutate(undefined, { onSuccess() { if (isUsingMainChatPage) { - navigate({ to: '/chats' }); + navigate({ to: '/chats/{-$chatId}' }); } }, }); diff --git a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-main.tsx b/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-main.tsx index a3bf488b5..6dac7d0bc 100644 --- a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-main.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-main.tsx @@ -83,7 +83,7 @@ const ChatPageMain = () => { onConfirm: () => { deleteChat.mutate(undefined, { onSuccess() { - navigate({ to: '/chats' }); + navigate({ to: '/chats/{-$chatId}' }); }, }); }, @@ -128,17 +128,17 @@ const ChatPageMain = () => { navigate({ to: '/chats' })} + onClick={() => navigate({ to: '/chats/{-$chatId}' })} /> - +
- + {chat.account.display_name || `@${chat.account.username}`} diff --git a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-new.tsx b/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-new.tsx index 68e4a7988..3681f1867 100644 --- a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-new.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-new.tsx @@ -28,7 +28,7 @@ const ChatPageNew: React.FC = () => { navigate({ to: '/chats' })} + onClick={() => navigate({ to: '/chats/{-$chatId}' })} /> diff --git a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-settings.tsx b/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-settings.tsx index c74e83b0e..08c35f1de 100644 --- a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-settings.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-settings.tsx @@ -58,7 +58,7 @@ const ChatPageSettings = () => { navigate({ to: '/chats' })} + onClick={() => navigate({ to: '/chats/{-$chatId}' })} /> diff --git a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-shoutbox.tsx b/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-shoutbox.tsx index 417701f63..67d6fe7c6 100644 --- a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-shoutbox.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-shoutbox.tsx @@ -25,7 +25,7 @@ const ChatPageShoutbox = () => { navigate({ to: '/chats' })} + onClick={() => navigate({ to: '/chats/{-$chatId}' })} /> diff --git a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx b/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx index 918d6244f..6b397e9f7 100644 --- a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx @@ -23,7 +23,7 @@ const ChatPageSidebar = () => { if (chat === 'shoutbox') { navigate({ to: '/chats/shoutbox' }); } else { - navigate({ to: '/chats/$chatId', params: { chatId: chat.id } }); + navigate({ to: '/chats/{-$chatId}', params: { chatId: chat.id } }); } }; diff --git a/packages/pl-fe/src/features/chats/components/chat-search/chat-search.tsx b/packages/pl-fe/src/features/chats/components/chat-search/chat-search.tsx index a8a004db8..8762527e2 100644 --- a/packages/pl-fe/src/features/chats/components/chat-search/chat-search.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-search/chat-search.tsx @@ -53,7 +53,7 @@ const ChatSearch: React.FC = ({ isMainPage = false }) => { }, onSuccess: (response) => { if (isMainPage) { - navigate({ to: '/chats/$chatId', params: { chatId: response.id } }); + navigate({ to: '/chats/{-$chatId}', params: { chatId: response.id } }); } else { changeScreen(ChatWidgetScreens.CHAT, response.id); } diff --git a/packages/pl-fe/src/features/event/components/event-header.tsx b/packages/pl-fe/src/features/event/components/event-header.tsx index 7158c817d..429ff2e51 100644 --- a/packages/pl-fe/src/features/event/components/event-header.tsx +++ b/packages/pl-fe/src/features/event/components/event-header.tsx @@ -175,7 +175,7 @@ const EventHeader: React.FC = ({ status }) => { const handleChatClick = () => { getOrCreateChatByAccountId(account.id) - .then((chat) => navigate({ to: '/chats/$chatId', params: { chatId: chat.id } })) + .then((chat) => navigate({ to: '/chats/{-$chatId}', params: { chatId: chat.id } })) .catch(() => {}); }; diff --git a/packages/pl-fe/src/features/ui/index.tsx b/packages/pl-fe/src/features/ui/index.tsx index 3939572fe..e14d73f9d 100644 --- a/packages/pl-fe/src/features/ui/index.tsx +++ b/packages/pl-fe/src/features/ui/index.tsx @@ -230,7 +230,7 @@ const SwitchingColumnsArea: React.FC = React.memo(({ chil - + @@ -272,7 +272,7 @@ const SwitchingColumnsArea: React.FC = React.memo(({ chil {features.events && } {features.events && } - {features.chats && } + {features.chats && } {features.chats && } {features.chats && } {features.shoutbox && }