From c33f84081459db16dce47301ec36ba0e5638aab3 Mon Sep 17 00:00:00 2001
From: Ilya Laktyushin <ilya@laktyush.in>
Date: Fri, 6 Dec 2024 18:50:33 +0400
Subject: [PATCH] Various fixes

---
 .../TelegramUI/Components/MediaEditor/Sources/MediaEditor.swift | 2 +-
 .../MediaScrubberComponent/Sources/MediaScrubberComponent.swift | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditor.swift b/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditor.swift
index a73620df11..ce4e02034f 100644
--- a/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditor.swift
+++ b/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditor.swift
@@ -1716,7 +1716,7 @@ public final class MediaEditor {
             let item = MediaEditorValues.VideoCollageItem(
                 content: content,
                 frame: item.frame,
-                videoTrimRange: nil,
+                videoTrimRange: 0 ..< item.duration,
                 videoOffset: nil,
                 videoVolume: passedFirstVideo ? 0.0 : nil
             )
diff --git a/submodules/TelegramUI/Components/MediaScrubberComponent/Sources/MediaScrubberComponent.swift b/submodules/TelegramUI/Components/MediaScrubberComponent/Sources/MediaScrubberComponent.swift
index af1247cf5f..f9da6fbe0b 100644
--- a/submodules/TelegramUI/Components/MediaScrubberComponent/Sources/MediaScrubberComponent.swift
+++ b/submodules/TelegramUI/Components/MediaScrubberComponent/Sources/MediaScrubberComponent.swift
@@ -772,7 +772,7 @@ public final class MediaScrubberComponent: Component {
             transition.setAlpha(view: self.trimView, alpha: trimVisible ? 1.0 : 0.0)
             
             var ghostTrimVisible = false
-            if let lowestVideoId, !component.isCollage && self.selectedTrackId != lowestVideoId {
+            if let lowestVideoId, self.selectedTrackId != lowestVideoId {
                 ghostTrimVisible = true
             }