Chat: Implement folder badges (follow-up 2) (#6197)

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "telegram-t",
-  "version": "10.9.70",
+  "version": "10.9.71",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "telegram-t",
-      "version": "10.9.70",
+      "version": "10.9.71",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@cryptography/aes": "^0.1.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "telegram-t",
-  "version": "10.9.70",
+  "version": "10.9.71",
   "description": "",
   "type": "module",
   "main": "index.js",

public/version.txt

@@ -1 +1 @@
-10.9.70
+10.9.71

src/components/left/main/Chat.scss

@@ -118,10 +118,6 @@
     }
   }
 
-  .ListItem-button {
-    height: 72px;
-  }
-
   .ripple-container {
     z-index: var(--z-chat-ripple);
   }
@@ -341,7 +337,7 @@
     }
 
     &.has-tags {
-      line-height: 1.25rem;
+      line-height: 1.375rem;
       .info-row {
         height: 1.25rem;
       }

src/components/left/main/Chat.tsx

@@ -359,6 +359,7 @@ const Chat: FC<OwnProps & StateProps> = ({
     isSelected && 'selected',
     isSelectedForum && 'selected-forum',
     isPreview && 'standalone',
+    shouldRenderTags && 'chat-item-with-tags',
     className,
   );
 

src/components/left/main/ChatTags.module.scss

@@ -5,6 +5,8 @@
 }
 
 .tag {
+  --custom-emoji-size: 0.75rem;
+
   --emoji-size: 0.75rem;
   --custom-emoji-size: 0.75rem;
 
@@ -21,7 +23,7 @@
 
   font-size: 0.625rem;
   font-weight: var(--font-weight-medium);
-  line-height: 0.75rem;
+  line-height: 0.875rem;
   color: var(--accent-color);
   text-align: center;
   text-transform: uppercase;

src/components/middle/composer/BotKeyboardMenu.tsx

@@ -20,12 +20,12 @@ import './BotKeyboardMenu.scss';
 export type OwnProps = {
   isOpen: boolean;
   messageId: number;
+  threadId?: ThreadId;
   onClose: NoneToVoidFunction;
 };
 
 type StateProps = {
   message?: ApiMessage;
-  threadId?: ThreadId;
 };
 
 const BotKeyboardMenu: FC<OwnProps & StateProps> = ({

src/components/ui/ListItem.scss

@@ -223,6 +223,12 @@
       padding: 0.5625rem;
     }
 
+    &.chat-item-with-tags {
+      .ListItem-button {
+        padding: 0.375rem 0.5625rem;
+      }
+    }
+
     &.contact-list-item {
       .ListItem-button {
         padding: 0.5rem;

src/global/actions/api/chats.ts

@@ -1711,6 +1711,7 @@ addActionHandler('openChatByUsername', async (global, actions, payload): Promise
           text,
           timestamp,
           linkContext,
+          isDirect,
         }, tabId,
       );
       if (onChatChanged) {
@@ -3406,12 +3407,13 @@ async function openChatByUsername<T extends GlobalState>(
     text?: string;
     timestamp?: number;
     linkContext?: LinkContext;
+    isDirect?: boolean;
   },
   ...[tabId = getCurrentTabId()]: TabArgs<T>
 ) {
   const {
     username, threadId, channelPostId, startParam, ref, startAttach, attach, text, timestamp,
-    linkContext,
+    linkContext, isDirect,
   } = params;
   const currentChat = selectCurrentChat(global, tabId);
 

src/global/types/actions.ts

@@ -1,4 +1,3 @@
-import { LinkContext } from './../../api/types/messages';
 import type {
   ApiAttachBot,
   ApiAttachment,
@@ -677,6 +676,7 @@ export interface ActionPayloads {
     timestamp?: number;
     onChatChanged?: CallbackAction;
     linkContext?: LinkContext;
+    isDirect?: boolean;
   } & WithTabId;
   processBoostParameters: {
     usernameOrId: string;