From 423a0dc085bd50e4a5e4b2a1b7565211ee8b474b Mon Sep 17 00:00:00 2001
From: Kylmakalle <iceman9831@gmail.com>
Date: Fri, 14 Nov 2025 23:47:38 +0200
Subject: [PATCH] Fix merge

---
 submodules/DebugSettingsUI/Sources/DebugController.swift      | 4 ++--
 .../Sources/ChatTextInputPanelComponent.swift                 | 4 ++--
 .../Sources/ChatTextInputPanelNode.swift                      | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/submodules/DebugSettingsUI/Sources/DebugController.swift b/submodules/DebugSettingsUI/Sources/DebugController.swift
index 3306ca3940..2c26c578d1 100644
--- a/submodules/DebugSettingsUI/Sources/DebugController.swift
+++ b/submodules/DebugSettingsUI/Sources/DebugController.swift
@@ -420,8 +420,8 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                 fileName = "Log-iOS-Swiftgram.txt"
                 appName = "Swiftgram"
             }
-            return ItemListDisclosureItem(presentationData: presentationData, systemStyle: .glass, title: title, sectionId: self.section, style: .blocks, action: {
-                let _ = (Logger.shared.collectLogs()
+            return ItemListDisclosureItem(presentationData: presentationData, systemStyle: .glass, title: title, label: "", sectionId: self.section, style: .blocks, action: {
+                let _ = (logCollectionSignal
                     |> deliverOnMainQueue).start(next: { logs in
                         let presentationData = arguments.sharedContext.currentPresentationData.with { $0 }
                         let actionSheet = ActionSheetController(presentationData: presentationData)
diff --git a/submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/ChatTextInputPanelComponent.swift b/submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/ChatTextInputPanelComponent.swift
index 1a0b15a8b4..d0983bc147 100644
--- a/submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/ChatTextInputPanelComponent.swift
+++ b/submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/ChatTextInputPanelComponent.swift
@@ -418,11 +418,11 @@ public final class ChatTextInputPanelComponent: Component {
                     deleteMessages: { _, _, f in
                         f(.default)
                     },
-                    forwardSelectedMessages: {
+                    forwardSelectedMessages: { _ in
                     },
                     forwardCurrentForwardMessages: {
                     },
-                    forwardMessages: { _ in
+                    forwardMessages: { _, _ in
                     },
                     updateForwardOptionsState: { _ in
                     },
diff --git a/submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/ChatTextInputPanelNode.swift b/submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/ChatTextInputPanelNode.swift
index 2e4cdb7ed9..9f8d9a9db9 100644
--- a/submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/ChatTextInputPanelNode.swift
+++ b/submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/ChatTextInputPanelNode.swift
@@ -2256,7 +2256,6 @@ public class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDeleg
         }
         // MARK: Swiftgram
         let originalLeftInset = leftInset
-        var leftInset = leftInset
         //
         
         let textInputBackgroundWidthOffset: CGFloat = 0.0