fix: pinned chats are toggled as selected when editing folder

Ajaxy · Dec 14, 2023 · 01e5dc0 · 01e5dc0
1 parent fdd5c31
commit 01e5dc0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/global/actions/api/chats.ts b/src/global/actions/api/chats.ts
@@ -945,7 +945,12 @@ addActionHandler('editChatFolders', (global, actions, payload): ActionReturnType
   const limit = selectCurrentLimit(global, 'dialogFiltersChats');
 
   const isLimitReached = idsToAdd
-    .some((id) => selectChatFolder(global, id)!.includedChatIds.length >= limit);
+    .some((id) => {
+      const { includedChatIds, pinnedChatIds } = selectChatFolder(global, id);
+      const totalChatsInFolder = (includedChatIds?.length || 0) + (pinnedChatIds?.length || 0);
+
+      return totalChatsInFolder >= limit;
+    });
   if (isLimitReached) {
     actions.openLimitReachedModal({ limit: 'dialogFiltersChats', tabId });
     return;

diff --git a/src/hooks/reducers/useFoldersReducer.ts b/src/hooks/reducers/useFoldersReducer.ts
@@ -29,7 +29,7 @@ export const EXCLUDED_CHAT_TYPES: FolderChatType[] = [
 ];
 
 const INCLUDE_FILTER_FIELDS: Array<keyof FolderIncludeFilters> = [
-  'includedChatIds', 'bots', 'channels', 'groups', 'contacts', 'nonContacts',
+  'includedChatIds', 'pinnedChatIds', 'bots', 'channels', 'groups', 'contacts', 'nonContacts',
 ];
 const EXCLUDE_FILTER_FIELDS: Array<keyof FolderExcludeFilters> = [
   'excludedChatIds', 'excludeArchived', 'excludeMuted', 'excludeRead',
@@ -42,6 +42,7 @@ export function selectChatFilters(state: FoldersState, mode: 'included' | 'exclu
   if (mode === 'included') {
     const {
       includedChatIds,
+      pinnedChatIds,
       ...includeFilters
     } = selectTemp
       ? state.includeFilters || {}
@@ -50,7 +51,7 @@ export function selectChatFilters(state: FoldersState, mode: 'included' | 'exclu
         INCLUDE_FILTER_FIELDS,
       );
 
-    selectedChatIds = includedChatIds || [];
+    selectedChatIds = (includedChatIds || []).concat(pinnedChatIds || []);
     selectedChatTypes = (Object.keys(includeFilters) as Array<keyof typeof includeFilters>)
       .filter((key) => Boolean(includeFilters[key]));
   } else {
@@ -106,7 +107,7 @@ function getSuggestedFolderName(includeFilters?: FolderIncludeFilters) {
 }
 
 type FolderIncludeFilters = Pick<ApiChatFolder, (
-  'includedChatIds' | 'bots' | 'channels' | 'groups' | 'contacts' | 'nonContacts'
+  'includedChatIds' | 'pinnedChatIds' | 'bots' | 'channels' | 'groups' | 'contacts' | 'nonContacts'
 )>;
 type FolderExcludeFilters = Pick<ApiChatFolder, 'excludedChatIds' | 'excludeArchived' | 'excludeMuted' | 'excludeRead'>;