Merge pull request #3029 from Bilb/fix-timer-fixed-shows-when-off

fix: show timer fixed when off update

ts/components/conversation/TimerNotification.tsx

@@ -11,13 +11,15 @@ import {
   useSelectedConversationDisappearingMode,
   useSelectedConversationKey,
   useSelectedExpireTimer,
+  useSelectedIsGroupOrCommunity,
+  useSelectedIsGroupV2,
   useSelectedIsNoteToSelf,
   useSelectedIsPrivate,
   useSelectedIsPrivateFriend,
 } from '../../state/selectors/selectedConversation';
 import { ReleasedFeatures } from '../../util/releaseFeature';
 import { Flex } from '../basic/Flex';
-import { TextWithChildren } from '../basic/Text';
+import { SpacerMD, TextWithChildren } from '../basic/Text';
 import { ExpirableReadableMessage } from './message/message-item/ExpirableReadableMessage';
 // eslint-disable-next-line import/order
 import { ConversationInteraction } from '../../interactions';
@@ -25,6 +27,7 @@ import { getConversationController } from '../../session/conversations';
 import { updateConfirmModal } from '../../state/ducks/modalDialog';
 import { SessionButtonColor } from '../basic/SessionButton';
 import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer';
+import { SessionIcon } from '../icon';
 
 const FollowSettingButton = styled.button`
   color: var(--primary-color);
@@ -182,6 +185,9 @@ export const TimerNotification = (props: PropsForExpirationTimer) => {
   const { messageId } = props;
 
   const textToRender = useTextToRender(props);
+  const isGroupOrCommunity = useSelectedIsGroupOrCommunity();
+  const isGroupV2 = useSelectedIsGroupV2();
+  const renderOffIcon = props.disabled || (isGroupOrCommunity && !isGroupV2);
 
   if (!textToRender || textToRender.length === 0) {
     throw new Error('textToRender invalid key used TimerNotification');
@@ -205,6 +211,16 @@ export const TimerNotification = (props: PropsForExpirationTimer) => {
         padding="5px 10px"
         style={{ textAlign: 'center' }}
       >
+        {renderOffIcon && (
+          <>
+            <SessionIcon
+              iconType="timerFixed"
+              iconSize={'tiny'}
+              iconColor="var(--text-secondary-color)"
+            />
+            <SpacerMD />
+          </>
+        )}
         <TextWithChildren subtle={true}>
           <SessionHtmlRenderer html={textToRender} />
         </TextWithChildren>

ts/components/conversation/header/ConversationHeaderSubtitle.tsx

@@ -123,7 +123,7 @@ export const ConversationHeaderSubtitle = (props: ConversationHeaderSubtitleProp
           <SessionIconButton
             iconColor={'var(--button-icon-stroke-selected-color)'}
             iconSize={'tiny'}
-            iconType="timer50"
+            iconType="timerFixed"
             margin={'0 var(--margins-xs) 0 0'}
           />
         )}

ts/components/conversation/header/ConversationHeaderTitle.tsx

@@ -8,7 +8,7 @@ import { resetRightOverlayMode, setRightOverlayMode } from '../../../state/ducks
 import {
   useSelectedConversationDisappearingMode,
   useSelectedConversationKey,
-  useSelectedIsGroup,
+  useSelectedIsGroupOrCommunity,
   useSelectedIsKickedFromGroup,
   useSelectedIsNoteToSelf,
   useSelectedIsPublic,
@@ -42,7 +42,7 @@ export const ConversationHeaderTitle = () => {
   const isPublic = useSelectedIsPublic();
   const isKickedFromGroup = useSelectedIsKickedFromGroup();
   const isMe = useSelectedIsNoteToSelf();
-  const isGroup = useSelectedIsGroup();
+  const isGroup = useSelectedIsGroupOrCommunity();
   const members = useSelectedMembers();
 
   const expirationMode = useSelectedConversationDisappearingMode();

ts/components/conversation/message/message-content/MessageAuthorText.tsx

@@ -10,7 +10,7 @@ import {
   useMessageDirection,
 } from '../../../../state/selectors';
 import {
-  useSelectedIsGroup,
+  useSelectedIsGroupOrCommunity,
   useSelectedIsPublic,
 } from '../../../../state/selectors/selectedConversation';
 import { Flex } from '../../../basic/Flex';
@@ -28,7 +28,7 @@ const StyledAuthorContainer = styled(Flex)<{ hideAvatar: boolean }>`
 
 export const MessageAuthorText = (props: Props) => {
   const isPublic = useSelectedIsPublic();
-  const isGroup = useSelectedIsGroup();
+  const isGroup = useSelectedIsGroupOrCommunity();
   const authorProfileName = useAuthorProfileName(props.messageId);
   const authorName = useAuthorName(props.messageId);
   const sender = useMessageAuthor(props.messageId);

ts/components/conversation/message/message-content/MessageReactBar.tsx

@@ -151,7 +151,7 @@ const ExpiresInItem = ({ expirationTimestamp }: { expirationTimestamp?: number |
 
   return (
     <StyledExpiresIn>
-      <SessionIcon iconSize={'small'} iconType="stopwatch" />
+      <SessionIcon iconSize={'small'} iconType="timerFixed" />
       <SpacerSM />
       <span>{formatTimeLeft({ timeLeftMs })}</span>
     </StyledExpiresIn>

ts/components/conversation/message/message-content/MessageReactions.tsx

@@ -4,7 +4,7 @@ import styled from 'styled-components';
 import { useMessageReactsPropsById } from '../../../../hooks/useParamSelector';
 import { MessageRenderingProps } from '../../../../models/messageType';
 import { REACT_LIMIT } from '../../../../session/constants';
-import { useSelectedIsGroup } from '../../../../state/selectors/selectedConversation';
+import { useSelectedIsGroupOrCommunity } from '../../../../state/selectors/selectedConversation';
 import { SortedReactionList } from '../../../../types/Reaction';
 import { nativeEmojiData } from '../../../../util/emoji';
 import { Flex } from '../../../basic/Flex';
@@ -175,7 +175,7 @@ export const MessageReactions = (props: Props) => {
 
   const msgProps = useMessageReactsPropsById(messageId);
 
-  const inGroup = useSelectedIsGroup();
+  const inGroup = useSelectedIsGroupOrCommunity();
 
   useEffect(() => {
     if (msgProps?.sortedReacts && !isEqual(reactions, msgProps?.sortedReacts)) {

ts/components/conversation/message/message-content/MessageStatus.tsx

@@ -6,7 +6,7 @@ import { useMessageExpirationPropsById } from '../../../../hooks/useParamSelecto
 import { useMessageStatus } from '../../../../state/selectors';
 
 import { getMostRecentMessageId } from '../../../../state/selectors/conversations';
-import { useSelectedIsGroup } from '../../../../state/selectors/selectedConversation';
+import { useSelectedIsGroupOrCommunity } from '../../../../state/selectors/selectedConversation';
 import { SpacerXS } from '../../../basic/Text';
 import { SessionIcon, SessionIconType } from '../../../icon';
 import { ExpireTimer } from '../../ExpireTimer';
@@ -179,7 +179,7 @@ function IconForExpiringMessageId({
 const MessageStatusSent = ({ dataTestId, messageId }: Omit<Props, 'isDetailView'>) => {
   const isExpiring = useIsExpiring(messageId);
   const isMostRecentMessage = useIsMostRecentMessage(messageId);
-  const isGroup = useSelectedIsGroup();
+  const isGroup = useSelectedIsGroupOrCommunity();
 
   // we hide a "sent" message status which is not expiring except for the most recent message
   if (!isExpiring && !isMostRecentMessage) {
@@ -204,7 +204,7 @@ const MessageStatusRead = ({
   isIncoming,
 }: Omit<Props, 'isDetailView'> & { isIncoming: boolean }) => {
   const isExpiring = useIsExpiring(messageId);
-  const isGroup = useSelectedIsGroup();
+  const isGroup = useSelectedIsGroupOrCommunity();
 
   const isMostRecentMessage = useIsMostRecentMessage(messageId);
 
@@ -231,7 +231,7 @@ const MessageStatusError = ({ dataTestId }: Omit<Props, 'isDetailView'>) => {
     ipcRenderer.send('show-debug-log');
   }, []);
   // when on error, we do not display the expire timer at all.
-  const isGroup = useSelectedIsGroup();
+  const isGroup = useSelectedIsGroupOrCommunity();
 
   return (
     <MessageStatusContainer

ts/components/conversation/message/message-content/quote/QuoteText.tsx

@@ -1,11 +1,11 @@
 import { isEmpty } from 'lodash';
 import React from 'react';
 import styled from 'styled-components';
+import { useSelectedIsGroupOrCommunity } from '../../../../../state/selectors/selectedConversation';
 import { MIME } from '../../../../../types';
 import { GoogleChrome } from '../../../../../util';
 import { MessageBody } from '../MessageBody';
 import { QuoteProps } from './Quote';
-import { useSelectedIsGroup } from '../../../../../state/selectors/selectedConversation';
 
 const StyledQuoteText = styled.div<{ isIncoming: boolean }>`
   display: -webkit-box;
@@ -61,7 +61,7 @@ export const QuoteText = (
 ) => {
   const { text, attachment, isIncoming, referencedMessageNotFound } = props;
 
-  const isGroup = useSelectedIsGroup();
+  const isGroup = useSelectedIsGroupOrCommunity();
 
   if (!referencedMessageNotFound && attachment && !isEmpty(attachment)) {
     const { contentType, isVoiceMessage } = attachment;

ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx

@@ -30,7 +30,7 @@ import {
   useSelectedDisplayNameInProfile,
   useSelectedIsActive,
   useSelectedIsBlocked,
-  useSelectedIsGroup,
+  useSelectedIsGroupOrCommunity,
   useSelectedIsKickedFromGroup,
   useSelectedIsLeft,
   useSelectedIsPublic,
@@ -128,7 +128,7 @@ const HeaderItem = () => {
   const isBlocked = useSelectedIsBlocked();
   const isKickedFromGroup = useSelectedIsKickedFromGroup();
   const left = useSelectedIsLeft();
-  const isGroup = useSelectedIsGroup();
+  const isGroup = useSelectedIsGroupOrCommunity();
   const subscriberCount = useSelectedSubscriberCount();
 
   if (!selectedConvoKey) {
@@ -201,7 +201,7 @@ export const OverlayRightPanelSettings = () => {
   const isBlocked = useSelectedIsBlocked();
   const isKickedFromGroup = useSelectedIsKickedFromGroup();
   const left = useSelectedIsLeft();
-  const isGroup = useSelectedIsGroup();
+  const isGroup = useSelectedIsGroupOrCommunity();
   const isPublic = useSelectedIsPublic();
   const weAreAdmin = useSelectedWeAreAdmin();
   const disappearingMessagesSubtitle = useDisappearingMessageSettingText({

ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx

@@ -12,8 +12,8 @@ import {
   useSelectedConversationDisappearingMode,
   useSelectedConversationKey,
   useSelectedExpireTimer,
-  useSelectedIsGroup,
-  useSelectedWeAreAdmin,
+  useSelectedIsGroupOrCommunity,
+  useSelectedWeAreAdmin
 } from '../../../../../state/selectors/selectedConversation';
 import { ReleasedFeatures } from '../../../../../util/releaseFeature';
 import { Flex } from '../../../../basic/Flex';
@@ -114,7 +114,7 @@ export const OverlayDisappearingMessages = () => {
   const disappearingModeOptions = useSelector(getSelectedConversationExpirationModes);
   const { singleMode, hasOnlyOneMode } = useSingleMode(disappearingModeOptions);
 
-  const isGroup = useSelectedIsGroup();
+  const isGroup = useSelectedIsGroupOrCommunity();
   const expirationMode = useSelectedConversationDisappearingMode();
   const expireTimer = useSelectedExpireTimer();
   const weAreAdmin = useSelectedWeAreAdmin();

ts/components/dialog/SessionConfirm.tsx

@@ -49,7 +49,7 @@ export interface SessionConfirmDialogProps {
    */
   onClickOk?: (...args: Array<any>) => Promise<void> | void;
 
-  onClickClose: () => any;
+  onClickClose?: () => any;
 
   /**
    * function to run on close click. Closes modal after execution by default
@@ -140,8 +140,8 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => {
    */
   const onClickCancelHandler = () => {
     onClickCancel?.();
-
     onClickClose?.();
+    window.inboxStore?.dispatch(updateConfirmModal(null));
   };
 
   return (

ts/components/icon/Icons.tsx

@@ -62,7 +62,6 @@ export type SessionIconType =
   | 'shield'
   | 'star'
   | 'sun'
-  | 'stopwatch'
   | 'qr'
   | 'users'
   | 'warning'
@@ -71,6 +70,7 @@ export type SessionIconType =
   | 'gallery'
   | 'stop'
   | 'thumbnail'
+  | 'timerFixed'
   | 'timer00'
   | 'timer05'
   | 'timer10'
@@ -450,12 +450,6 @@ export const icons: Record<string, { path: string; viewBox: string; ratio: numbe
     viewBox: '0 0 384 384',
     ratio: 1,
   },
-  stopwatch: {
-    path:
-      'M3.72595 5.64444C4.38882 6.30732 5.06159 6.93556 5.68489 7.51434C6.32303 8.09312 7.01064 8.71147 7.71309 9.30509C8.5392 10.0075 9.19219 10.527 9.83527 10.9969C10.043 11.1503 10.2904 11.2294 10.5476 11.2294C10.8741 11.2294 11.1956 11.0958 11.4232 10.8584C11.8882 10.3786 11.8734 9.60685 11.3935 9.14184C10.8197 8.59275 10.1964 8.0387 9.36038 7.34615C8.65298 6.75748 7.9258 6.18859 7.24808 5.65928C6.56542 5.14481 5.83329 4.59077 5.06159 4.05156C4.17116 3.42332 3.46871 2.95832 2.78605 2.54773C2.67227 2.47848 2.53871 2.44385 2.40515 2.44385C2.22706 2.44385 2.05392 2.50816 1.92036 2.62688C1.61365 2.89401 1.58397 3.35901 1.8511 3.66571C2.37546 4.26922 2.95424 4.88263 3.72595 5.64444V5.64444Z M10.5571 0.0595703C10.0228 0.0595703 9.58752 0.494891 9.58752 1.02915V4.71948C9.58752 5.25373 10.0228 5.68905 10.5571 5.68905C11.0914 5.68905 11.5267 5.25373 11.5267 4.71948V2.05809C15.5237 2.54287 18.6155 6.00565 18.6155 10.062C18.6155 14.5043 14.9993 18.1204 10.5571 18.1204C6.11485 18.1204 2.49872 14.5043 2.49872 10.0571C2.49872 9.52284 2.0634 9.08752 1.52915 9.08752C0.994891 9.08752 0.55957 9.52284 0.55957 10.0571C0.55957 15.5728 5.04634 20.0546 10.5571 20.0546C16.0679 20.0546 20.5546 15.5679 20.5546 10.0571C20.5546 4.54634 16.0728 0.0595703 10.5571 0.0595703Z',
-    viewBox: '0 0 21 21',
-    ratio: 1,
-  },
   sun: {
     path:
       'M16.6209 7.62069C11.8081 7.62069 7.89156 11.5372 7.89156 16.35C7.89156 21.1628 11.8081 25.0793 16.6209 25.0793C21.4337 25.0793 25.3502 21.1628 25.3502 16.35C25.3502 11.5372 21.4337 7.62069 16.6209 7.62069ZM16.6209 22.5852C13.1768 22.5852 10.3856 19.794 10.3856 16.35C10.3856 12.906 13.1768 10.1148 16.6209 10.1148C20.0649 10.1148 22.8561 12.906 22.8561 16.35C22.8561 19.794 20.0649 22.5852 16.6209 22.5852ZM16.6209 5.1266C17.3093 5.1266 17.8679 4.568 17.8679 3.87956V1.38547C17.8679 0.697025 17.3093 0.138428 16.6209 0.138428C15.9324 0.138428 15.3738 0.697025 15.3738 1.38547V3.87956C15.3738 4.568 15.9324 5.1266 16.6209 5.1266ZM16.6209 27.5734C15.9324 27.5734 15.3738 28.132 15.3738 28.8204V31.3145C15.3738 32.0029 15.9324 32.5615 16.6209 32.5615C17.3093 32.5615 17.8679 32.0029 17.8679 31.3145V28.8204C17.8679 28.132 17.3093 27.5734 16.6209 27.5734ZM26.3196 8.4131L28.083 6.64971C28.5701 6.16258 28.5701 5.37344 28.083 4.88631C27.5959 4.39918 26.8067 4.39918 26.3196 4.88631L24.5562 6.64971C24.0691 7.13683 24.0691 7.92598 24.5562 8.4131C25.0433 8.90023 25.8325 8.90023 26.3196 8.4131ZM6.92214 24.2869L5.15874 26.0503C4.67162 26.5374 4.67162 27.3265 5.15874 27.8137C5.64587 28.3008 6.43501 28.3008 6.92214 27.8137L8.68554 26.0503C9.17266 25.5616 9.17266 24.774 8.68554 24.2869C8.19849 23.7997 7.40927 23.7981 6.92214 24.2869ZM5.39747 16.35C5.39747 15.6615 4.83888 15.1029 4.15043 15.1029H1.65634C0.967899 15.1029 0.409302 15.6615 0.409302 16.35C0.409302 17.0384 0.967899 17.597 1.65634 17.597H4.15043C4.83888 17.597 5.39747 17.0384 5.39747 16.35ZM31.5854 15.1029H29.0913C28.4028 15.1029 27.8442 15.6615 27.8442 16.35C27.8442 17.0384 28.4028 17.597 29.0913 17.597H31.5854C32.2738 17.597 32.8324 17.0384 32.8324 16.35C32.8324 15.6615 32.2738 15.1029 31.5854 15.1029ZM6.9205 8.4131C7.40771 8.90023 8.19685 8.90023 8.6839 8.4131C9.1711 7.92598 9.1711 7.13683 8.6839 6.64971L6.9205 4.88631C6.43338 4.39918 5.64431 4.39918 5.15711 4.88631C4.66998 5.37344 4.66998 6.16258 5.15711 6.64971L6.9205 8.4131ZM26.3212 24.2852C25.8325 23.7981 25.0449 23.7981 24.5578 24.2852C24.0706 24.7724 24.0691 25.5615 24.5578 26.0486L26.3212 27.812C26.8083 28.2992 27.5974 28.2992 28.0845 27.812C28.5717 27.3249 28.5717 26.5358 28.0845 26.0486L26.3212 24.2852Z',
@@ -510,6 +504,12 @@ export const icons: Record<string, { path: string; viewBox: string; ratio: numbe
     viewBox: '0 0 44 36',
     ratio: 1,
   },
+  timerFixed: {
+    path:
+      'M5.20275 9.76294C7.66271 9.76294 9.70508 7.72417 9.70508 5.26294C9.70508 2.8017 7.66739 0.762939 5.20742 0.762939C4.97582 0.762939 4.86159 0.904449 4.86159 1.13036V2.84113C4.86159 3.03411 4.99262 3.18774 5.18369 3.18774C5.37846 3.18774 5.5095 3.03411 5.5095 2.84113V1.12523L5.20076 1.5104C7.28918 1.5104 8.94868 3.17916 8.94868 5.26294C8.94868 7.34577 7.2845 9.01548 5.20275 9.01548C3.12568 9.01548 1.45216 7.34577 1.45588 5.26294C1.46055 4.33478 1.79031 3.49025 2.34356 2.84123C2.47745 2.66983 2.48776 2.46187 2.34079 2.30546C2.19286 2.15278 1.95322 2.16214 1.79126 2.36161C1.11816 3.14832 0.705078 4.16242 0.705078 5.26294C0.705078 7.72417 2.74651 9.76294 5.20275 9.76294ZM5.91055 5.89683C6.25839 5.53191 6.1871 5.0423 5.76617 4.75148L3.43483 3.11983C3.21553 2.96888 2.98507 3.19479 3.14157 3.4142L4.77141 5.75142C5.06209 6.16789 5.55145 6.2439 5.91055 5.89683Z',
+    viewBox: '0 0 10 10',
+    ratio: 1,
+  },
   timer00: {
     path:
       'M11.428367,3.44328115 L10.5587469,3.94535651 C10.4906607,3.79477198 10.4145019,3.64614153 10.330127,3.5 C10.2457522,3.35385847 10.1551138,3.21358774 10.0587469,3.07933111 L10.928367,2.57725574 C11.0225793,2.71323387 11.1119641,2.85418158 11.1961524,3 C11.2803407,3.14581842 11.3577126,3.2937018 11.428367,3.44328115 Z M9.42274426,1.07163304 L8.92066889,1.94125309 C8.78641226,1.84488615 8.64614153,1.75424783 8.5,1.66987298 C8.35385847,1.58549813 8.20522802,1.50933927 8.05464349,1.44125309 L8.55671885,0.571633044 C8.7062982,0.642287382 8.85418158,0.719659271 9,0.803847577 C9.14581842,0.888035884 9.28676613,0.977420696 9.42274426,1.07163304 Z M11.9794631,6.5 L10.9753124,6.5 C10.9916403,6.33554688 11,6.1687497 11,6 C11,5.8312503 10.9916403,5.66445312 10.9753124,5.5 L11.9794631,5.5 C11.9930643,5.66486669 12,5.83162339 12,6 C12,6.16837661 11.9930643,6.33513331 11.9794631,6.5 Z M10.928367,9.42274426 L10.0587469,8.92066889 C10.1551138,8.78641226 10.2457522,8.64614153 10.330127,8.5 C10.4145019,8.35385847 10.4906607,8.20522802 10.5587469,8.05464349 L11.428367,8.55671885 C11.3577126,8.7062982 11.2803407,8.85418158 11.1961524,9 C11.1119641,9.14581842 11.0225793,9.28676613 10.928367,9.42274426 Z M8.55671885,11.428367 L8.05464349,10.5587469 C8.20522802,10.4906607 8.35385847,10.4145019 8.5,10.330127 C8.64614153,10.2457522 8.78641226,10.1551138 8.92066889,10.0587469 L9.42274426,10.928367 C9.28676613,11.0225793 9.14581842,11.1119641 9,11.1961524 C8.85418158,11.2803407 8.7062982,11.3577126 8.55671885,11.428367 Z M2.57725574,10.928367 L3.07933111,10.0587469 C3.21358774,10.1551138 3.35385847,10.2457522 3.5,10.330127 C3.64614153,10.4145019 3.79477198,10.4906607 3.94535651,10.5587469 L3.44328115,11.428367 C3.2937018,11.3577126 3.14581842,11.2803407 3,11.1961524 C2.85418158,11.1119641 2.71323387,11.0225793 2.57725574,10.928367 Z M5.5,11.9794631 L5.5,10.9753124 C5.66445312,10.9916403 5.8312503,11 6,11 C6.1687497,11 6.33554688,10.9916403 6.5,10.9753124 L6.5,11.9794631 C6.33513331,11.9930643 6.16837661,12 6,12 C5.83162339,12 5.66486669,11.9930643 5.5,11.9794631 Z M0.571633044,8.55671885 L1.44125309,8.05464349 C1.50933927,8.20522802 1.58549813,8.35385847 1.66987298,8.5 C1.75424783,8.64614153 1.84488615,8.78641226 1.94125309,8.92066889 L1.07163304,9.42274426 C0.977420696,9.28676613 0.888035884,9.14581842 0.803847577,9 C0.719659271,8.85418158 0.642287382,8.7062982 0.571633044,8.55671885 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -9.95062878e-13,6.16837661 -9.95093808e-13,6 C-9.95124738e-13,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z M6.5,0.0205368885 L6.5,7 L5.5,7 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,5.01e-14 6,5.01e-14 C6.16837661,5.01e-14 6.33513331,0.00693566443 6.5,0.0205368885 Z',

ts/state/selectors/selectedConversation.ts

@@ -121,16 +121,25 @@ function getSelectedBlindedDisabledMsgRequests(state: StateType) {
   return isBlindedAndDisabledMsgRequests;
 }
 
-/**
- * Returns true if the current conversation selected is a group conversation.
- * Returns false if the current conversation selected is not a group conversation, or none are selected
- */
-const getSelectedConversationIsGroup = (state: StateType): boolean => {
+const getSelectedConversationType = (state: StateType): ConversationTypeEnum | null => {
+  const selected = getSelectedConversation(state);
+  if (!selected || !selected.type) {
+    return null;
+  }
+  return selected.type;
+};
+
+const getSelectedConversationIsGroupOrCommunity = (state: StateType): boolean => {
+  const type = getSelectedConversationType(state);
+  return type ? isOpenOrClosedGroup(type) : false;
+};
+
+const getSelectedConversationIsGroupV2 = (state: StateType): boolean => {
   const selected = getSelectedConversation(state);
   if (!selected || !selected.type) {
     return false;
   }
-  return selected.type ? isOpenOrClosedGroup(selected.type) : false;
+  return selected.type === ConversationTypeEnum.GROUPV3;
 };
 
 /**
@@ -232,8 +241,12 @@ export function useSelectedConversationKey() {
   return useSelector(getSelectedConversationKey);
 }
 
-export function useSelectedIsGroup() {
-  return useSelector(getSelectedConversationIsGroup);
+export function useSelectedIsGroupOrCommunity() {
+  return useSelector(getSelectedConversationIsGroupOrCommunity);
+}
+
+export function useSelectedIsGroupV2() {
+  return useSelector(getSelectedConversationIsGroupV2);
 }
 
 export function useSelectedIsPublic() {