fix: admins can only delete group

also fixed the right click on pending groupv2 invite

Author: Bilb

ts/components/conversation/header/ConversationHeaderItems.tsx

@@ -13,15 +13,26 @@ import {
 } from '../../../state/selectors/selectedConversation';
 import { Avatar, AvatarSize } from '../../avatar/Avatar';
 import { SessionIconButton } from '../../icon';
-import { useIsLegacyGroup } from '../../../hooks/useParamSelector';
+import { useIsGroupV2, useIsLegacyGroup } from '../../../hooks/useParamSelector';
+import { useLibGroupInvitePending } from '../../../state/selectors/userGroups';
 
 export const AvatarHeader = (props: { pubkey: string; onAvatarClick?: () => void }) => {
   const { pubkey, onAvatarClick } = props;
   const isApproved = useSelectedIsApproved();
 
   const isLegacyGroup = useIsLegacyGroup(pubkey);
+  const invitePending = useLibGroupInvitePending(pubkey);
+  const isPrivate = useSelectedIsPrivate();
+  const isGroupV2 = useIsGroupV2(pubkey);
+
+  const canClickLegacy = isLegacyGroup && false; // we can never click the avatar if it's a legacy group
+  const canClickPrivateApproved = isApproved && isPrivate; // we can only click the avatar if it's a private and approved conversation
+  const canClick03GroupAccepted = isGroupV2 && !invitePending; // we can only click the avatar if it's a group and have accepted the invite already
 
-  const optOnAvatarClick = !isLegacyGroup && isApproved ? onAvatarClick : undefined;
+  const optOnAvatarClick =
+    canClickLegacy || canClickPrivateApproved || canClick03GroupAccepted
+      ? onAvatarClick
+      : undefined;
 
   return (
     <span className="module-conversation-header__avatar">

ts/components/menuAndSettingsHooks/useShowLeaveGroup.ts

@@ -3,6 +3,7 @@ import {
   useIsKickedFromGroup,
   useIsGroupDestroyed,
   useConversationUsername,
+  useWeAreAdmin,
 } from '../../hooks/useParamSelector';
 import {
   showDeleteGroupByConvoId,
@@ -16,6 +17,7 @@ export function useShowLeaveGroupCb(conversationId?: string) {
   const isGroupDestroyed = useIsGroupDestroyed(conversationId);
   const isMessageRequestShown = useIsMessageRequestOverlayShown();
   const username = useConversationUsername(conversationId) || conversationId;
+  const weAreAdmin = useWeAreAdmin(conversationId);
 
   // Note: if we are the only admin, leaving it will warn that it will actually delete it for everyone.
 
@@ -24,7 +26,8 @@ export function useShowLeaveGroupCb(conversationId?: string) {
     isMessageRequestShown ||
     isGroupDestroyed ||
     isKickedFromGroup ||
-    !conversationId
+    !conversationId ||
+    weAreAdmin
   ) {
     return null;
   }

ts/state/selectors/selectedConversation.ts

@@ -262,7 +262,7 @@ export function useSelectedIsBlocked() {
 
 export function useSelectedIsApproved() {
   return useSelector((state: StateType): boolean => {
-    return !!(getSelectedConversation(state)?.isApproved || false);
+    return getSelectedConversation(state)?.isApproved || false;
   });
 }