diff --git a/app/soapbox/components/groups/popover/group-popover.tsx b/app/soapbox/components/groups/popover/group-popover.tsx
index 752deeb8af..ba2457fb30 100644
--- a/app/soapbox/components/groups/popover/group-popover.tsx
+++ b/app/soapbox/components/groups/popover/group-popover.tsx
@@ -80,7 +80,7 @@ const GroupPopover = (props: IGroupPopoverContainer) => {
-
+
diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx
index 752e73636b..24131159dd 100644
--- a/app/soapbox/components/status.tsx
+++ b/app/soapbox/components/status.tsx
@@ -253,7 +253,7 @@ const Status: React.FC
= (props) => {
return (
}
text={
diff --git a/app/soapbox/features/group/components/group-action-button.tsx b/app/soapbox/features/group/components/group-action-button.tsx
index 96f807f9dc..96653f97e0 100644
--- a/app/soapbox/features/group/components/group-action-button.tsx
+++ b/app/soapbox/features/group/components/group-action-button.tsx
@@ -82,7 +82,7 @@ const GroupActionButton = ({ group }: IGroupActionButton) => {
return (
diff --git a/app/soapbox/features/group/group-blocked-members.tsx b/app/soapbox/features/group/group-blocked-members.tsx
index 94b0338374..988b90b1be 100644
--- a/app/soapbox/features/group/group-blocked-members.tsx
+++ b/app/soapbox/features/group/group-blocked-members.tsx
@@ -86,7 +86,7 @@ const GroupBlockedMembers: React.FC = ({ params }) => {
const emptyMessage = ;
return (
-
+
= (props) => {
itemClassName='py-3 last:pb-0'
prepend={(pendingCount > 0) && (
)}
>
diff --git a/app/soapbox/features/group/manage-group.tsx b/app/soapbox/features/group/manage-group.tsx
index 38b90e34b3..dd3efe9cde 100644
--- a/app/soapbox/features/group/manage-group.tsx
+++ b/app/soapbox/features/group/manage-group.tsx
@@ -77,12 +77,12 @@ const ManageGroup: React.FC = ({ params }) => {
},
}));
- const navigateToEdit = () => history.push(`/groups/${id}/manage/edit`);
- const navigateToPending = () => history.push(`/groups/${id}/manage/requests`);
- const navigateToBlocks = () => history.push(`/groups/${id}/manage/blocks`);
+ const navigateToEdit = () => history.push(`/group/${group.slug}/manage/edit`);
+ const navigateToPending = () => history.push(`/group/${group.slug}/manage/requests`);
+ const navigateToBlocks = () => history.push(`/group/${group.slug}/manage/blocks`);
return (
-
+
{isOwner && (
<>
diff --git a/app/soapbox/features/groups/components/discover/group-grid-item.tsx b/app/soapbox/features/groups/components/discover/group-grid-item.tsx
index 17d53225ed..fd1168f4ed 100644
--- a/app/soapbox/features/groups/components/discover/group-grid-item.tsx
+++ b/app/soapbox/features/groups/components/discover/group-grid-item.tsx
@@ -25,7 +25,7 @@ const GroupGridItem = forwardRef((props: IGroup, ref: React.ForwardedRef
-
+
{
alignItems='center'
justifyContent='between'
>
-
+
{
placeholderCount={3}
>
{groups.map((group) => (
-
+
))}
diff --git a/app/soapbox/features/groups/pending-requests.tsx b/app/soapbox/features/groups/pending-requests.tsx
index cc9ceed1d4..1233ff3a7d 100644
--- a/app/soapbox/features/groups/pending-requests.tsx
+++ b/app/soapbox/features/groups/pending-requests.tsx
@@ -57,7 +57,7 @@ export default () => {
showLoading={isLoading && groups.length === 0}
>
{groups.map((group) => (
-
+
))}
diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx
index 818d837209..aaae4b9c7f 100644
--- a/app/soapbox/features/status/index.tsx
+++ b/app/soapbox/features/status/index.tsx
@@ -119,6 +119,7 @@ type DisplayMedia = 'default' | 'hide_all' | 'show_all';
type RouteParams = {
statusId: string
groupId?: string
+ groupSlug?: string
};
interface IThread {
@@ -517,8 +518,10 @@ const Thread: React.FC = (props) => {
children.push(...renderChildren(descendantsIds).toArray());
}
- if (status.group && typeof status.group === 'object' && !props.params.groupId) {
- return ;
+ if (status.group && typeof status.group === 'object') {
+ if (status.group.slug && !props.params.groupSlug) {
+ return ;
+ }
}
const titleMessage = () => {
diff --git a/app/soapbox/pages/group-page.tsx b/app/soapbox/pages/group-page.tsx
index 61e41ad25b..13dda54679 100644
--- a/app/soapbox/pages/group-page.tsx
+++ b/app/soapbox/pages/group-page.tsx
@@ -77,19 +77,19 @@ const GroupPage: React.FC = ({ params, children }) => {
const items = [
{
text: intl.formatMessage(messages.all),
- to: group?.slug ? `/group/${group.slug}` : `/groups/${group?.id}`,
- name: group?.slug ? '/group/:groupSlug' : '/groups/:groupId',
+ to: `/group/${group?.slug}`,
+ name: '/group/:groupSlug',
},
{
text: intl.formatMessage(messages.members),
- to: group?.slug ? `/group/${group.slug}/members` : `/groups/${group?.id}/members`,
- name: group?.slug ? '/group/:groupSlug/members' : '/groups/:groupId/members',
+ to: `/group/${group?.slug}/members`,
+ name: '/group/:groupSlug/members',
count: pending.length,
},
{
text: intl.formatMessage(messages.media),
- to: group?.slug ? `/group/${group.slug}/media` : `/groups/${group?.id}/media`,
- name: group?.slug ? '/group/:groupSlug' : '/groups/:groupId/media',
+ to: `/group/${group?.slug}/media`,
+ name: '/group/:groupSlug',
},
];