diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index 94c0baef5..25c4cc45b 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -475,6 +475,7 @@ export class ConversationHeader extends React.Component { isPublic, isRss, isGroup, + isBlocked, onResetSession, i18n ); diff --git a/ts/session/utils/Menu.tsx b/ts/session/utils/Menu.tsx index 1834daf48..2d7637f43 100644 --- a/ts/session/utils/Menu.tsx +++ b/ts/session/utils/Menu.tsx @@ -32,9 +32,10 @@ function showSafetyNumber( function showResetSession( isPublic: boolean, isRss: boolean, - isGroup: boolean + isGroup: boolean, + isBlocked: boolean ): boolean { - return !isPublic && !isRss && !isGroup; + return !isPublic && !isRss && !isGroup && !isBlocked; } function showBlock(isMe: boolean, isPrivate: boolean): boolean { @@ -299,10 +300,11 @@ export function getResetSessionMenuItem( isPublic: boolean | undefined, isRss: boolean | undefined, isGroup: boolean | undefined, + isBlocked: boolean | undefined, action: any, i18n: LocalizerType ): JSX.Element | null { - if (showResetSession(Boolean(isPublic), Boolean(isRss), Boolean(isGroup))) { + if (showResetSession(Boolean(isPublic), Boolean(isRss), Boolean(isGroup), Boolean(isBlocked),)) { return {i18n('resetSession')}; } return null;