Skip to content

Commit

Permalink
Merge branch 'development' into feat/2641-chat-and-marketplace-header…
Browse files Browse the repository at this point in the history
…-buttons
  • Loading branch information
Derikyan authored Nov 26, 2024
2 parents 03f5282 + 8649f7b commit 7465287
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion apps/chat/src/components/Chat/ChatHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ export const ChatHeader = ({
const isExternal = useAppSelector(
ConversationsSelectors.selectAreSelectedConversationsExternal,
);
const isSelectMode = useAppSelector(
ConversationsSelectors.selectIsSelectMode,
);
const isIsolatedView = useAppSelector(SettingsSelectors.selectIsIsolatedView);
const isChatbarEnabled = useAppSelector((state) =>
SettingsSelectors.isFeatureEnabled(state, Feature.ConversationsSection),
Expand All @@ -104,7 +107,8 @@ export const ChatHeader = ({
ConversationsSelectors.selectSelectedConversations,
);

const isContextMenuVisible = !isIsolatedView && isChatbarEnabled;
const isContextMenuVisible =
!isIsolatedView && isChatbarEnabled && !isSelectMode;

const isMessageStreaming = useMemo(
() => selectedConversations.some((conv) => conv.isMessageStreaming),
Expand Down

0 comments on commit 7465287

Please sign in to comment.