Merge branch 'group-improvements' into 'develop'
Improve Group UX See merge request soapbox-pub/soapbox!2494
This commit is contained in:
@@ -40,7 +40,7 @@ const GroupMediaPanel: React.FC<IGroupMediaPanel> = ({ group }) => {
|
||||
useEffect(() => {
|
||||
setLoading(true);
|
||||
|
||||
if (group && (isMember || !isPrivate)) {
|
||||
if (group && !group.deleted_at && (isMember || !isPrivate)) {
|
||||
dispatch(expandGroupMediaTimeline(group.id))
|
||||
// @ts-ignore
|
||||
.then(() => setLoading(false))
|
||||
@@ -72,7 +72,7 @@ const GroupMediaPanel: React.FC<IGroupMediaPanel> = ({ group }) => {
|
||||
}
|
||||
};
|
||||
|
||||
if (isPrivate && !isMember) {
|
||||
if ((isPrivate && !isMember) || group?.deleted_at) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ const ConfirmationStep: React.FC<IConfirmationStep> = ({ group }) => {
|
||||
const intl = useIntl();
|
||||
|
||||
const handleCopyLink = () => {
|
||||
copy(`${window.location.origin}/group/${group?.slug}`, () => {
|
||||
copy(group?.url as string, () => {
|
||||
toast.success(intl.formatMessage(messages.copied));
|
||||
});
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user