From d3faf52a4c27aa93e6a4f46383f4e3c5e47420a8 Mon Sep 17 00:00:00 2001
From: Ilya Laktyushin <ilya@laktyush.in>
Date: Fri, 12 Jan 2024 11:16:22 +0400
Subject: [PATCH] Video message recording improvements

---
 .../Telegram-iOS/en.lproj/Localizable.strings |    6 +
 .../Sources/AccountContext.swift              |    2 +
 .../Sources/ChatController.swift              |    6 +
 submodules/Camera/Sources/Camera.swift        |  126 +-
 submodules/Camera/Sources/CameraDevice.swift  |    9 +
 submodules/Camera/Sources/CameraOutput.swift  |  187 ++-
 .../Sources/CameraRoundVideoFilter.swift      |  181 +++
 submodules/Camera/Sources/VideoRecorder.swift |    2 +-
 .../ChatPresentationInterfaceState.swift      |   98 +-
 .../TGModernConversationInputMicButton.h      |    2 -
 .../TGModernConversationInputMicButton.m      |   27 -
 .../Sources/MediaResources.swift              |   23 +-
 submodules/PremiumUI/BUILD                    |    1 +
 .../Sources/PremiumPrivacyScreen.swift        |   20 +-
 .../Source/Signal_Combine.swift               |    8 +
 .../Sources/ScreenCaptureDetection.swift      |    4 +
 .../TelegramNotices/Sources/Notices.swift     |   96 ++
 submodules/TelegramUI/BUILD                   |    2 +
 .../CameraScreen/Sources/CameraScreen.swift   |    1 -
 .../ChatMessageContactBubbleContentNode.swift |   35 +-
 .../ChatTextInputMediaRecordingButton.swift   |    6 +-
 .../Sources/LockView.swift                    |   85 +-
 .../MediaEditor/Sources/MediaEditor.swift     |    2 +-
 .../Sources/MediaEditorValues.swift           |    2 +-
 .../Components/MediaEditorScreen/BUILD        |    1 +
 .../Sources/MediaEditorScreen.swift           |   22 +
 .../Components/MediaScrubberComponent/BUILD   |   25 +
 .../Sources/MediaScrubberComponent.swift      |  242 ++-
 .../MessageInputActionButtonComponent.swift   |    1 +
 .../Sources/MediaPreviewPanelComponent.swift  |  136 +-
 .../Sources/MessageInputPanelComponent.swift  |    2 +-
 .../Sources/PlainButtonComponent.swift        |   41 +-
 .../Sources/FetchVideoMediaResource.swift     |   61 +-
 ...StoryItemSetContainerViewSendMessage.swift |    8 +-
 .../Components/VideoMessageCameraScreen/BUILD |   44 +
 .../Sources/RecordingProgressView.swift       |   59 +
 .../Sources/ResultPreviewView.swift           |  119 ++
 .../Sources/VideoMessageCameraScreen.swift    | 1314 +++++++++++++++++
 .../VideoMessageFlip.imageset/Contents.json   |   12 +
 .../switchcamera_30.pdf                       |  188 +++
 .../Animations/PremiumPrivacyPresence.tgs     |  Bin 0 -> 4940 bytes
 .../Animations/PremiumPrivacyRead.tgs         |  Bin 0 -> 9566 bytes
 .../Sources/ApplicationContext.swift          |    8 +-
 .../TelegramUI/Sources/ChatController.swift   |  184 ++-
 .../Sources/ChatHistoryListNode.swift         |   15 +-
 ...essageContextControllerContentSource.swift |    7 +-
 .../ChatRecordingPreviewInputPanelNode.swift  |  130 +-
 .../ChatTextInputActionButtonsNode.swift      |    2 +-
 .../Sources/ChatTextInputPanelNode.swift      |   68 +-
 .../Sources/SharedAccountContext.swift        |    1 +
 50 files changed, 3129 insertions(+), 492 deletions(-)
 create mode 100644 submodules/Camera/Sources/CameraRoundVideoFilter.swift
 create mode 100644 submodules/TelegramUI/Components/MediaScrubberComponent/BUILD
 rename submodules/TelegramUI/Components/{MediaEditorScreen => MediaScrubberComponent}/Sources/MediaScrubberComponent.swift (88%)
 create mode 100644 submodules/TelegramUI/Components/VideoMessageCameraScreen/BUILD
 create mode 100644 submodules/TelegramUI/Components/VideoMessageCameraScreen/Sources/RecordingProgressView.swift
 create mode 100644 submodules/TelegramUI/Components/VideoMessageCameraScreen/Sources/ResultPreviewView.swift
 create mode 100644 submodules/TelegramUI/Components/VideoMessageCameraScreen/Sources/VideoMessageCameraScreen.swift
 create mode 100644 submodules/TelegramUI/Images.xcassets/Camera/VideoMessageFlip.imageset/Contents.json
 create mode 100644 submodules/TelegramUI/Images.xcassets/Camera/VideoMessageFlip.imageset/switchcamera_30.pdf
 create mode 100644 submodules/TelegramUI/Resources/Animations/PremiumPrivacyPresence.tgs
 create mode 100644 submodules/TelegramUI/Resources/Animations/PremiumPrivacyRead.tgs

diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
index eacceb642e..fab714a353 100644
--- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
@@ -10886,3 +10886,9 @@ Sorry for the inconvenience.";
 
 "Conversation.ContactAddContact" = "ADD";
 "Conversation.ContactMessage" = "MESSAGE";
+
+"Chat.PlayOnceVideoMessageTooltip" = "This video message can only be played once.";
+"Chat.PlayOnceVideoMessageYourTooltip" = "This message will disappear once **%@** plays it once.";
+
+"Chat.TapToPlayVideoMessageOnceTooltip" = "Tap to set this message to **Play Once**";
+"Chat.PlayVideoMessageOnceTooltip" = "The recipient will be able to play it only once.";
diff --git a/submodules/AccountContext/Sources/AccountContext.swift b/submodules/AccountContext/Sources/AccountContext.swift
index ad9ce72255..360823d399 100644
--- a/submodules/AccountContext/Sources/AccountContext.swift
+++ b/submodules/AccountContext/Sources/AccountContext.swift
@@ -977,6 +977,8 @@ public protocol SharedAccountContext: AnyObject {
     var enablePreloads: Promise<Bool> { get }
     var hasPreloadBlockingContent: Promise<Bool> { get }
     
+    var deviceContactPhoneNumbers: Promise<Set<String>> { get }
+    
     var hasGroupCallOnScreen: Signal<Bool, NoError> { get }
     var currentGroupCallController: ViewController? { get }
     
diff --git a/submodules/AccountContext/Sources/ChatController.swift b/submodules/AccountContext/Sources/ChatController.swift
index c2e25b59a1..a9c229ab10 100644
--- a/submodules/AccountContext/Sources/ChatController.swift
+++ b/submodules/AccountContext/Sources/ChatController.swift
@@ -53,6 +53,7 @@ public final class ChatMessageItemAssociatedData: Equatable {
     public let recommendedChannels: RecommendedChannels?
     public let audioTranscriptionTrial: AudioTranscription.TrialState
     public let chatThemes: [TelegramTheme]
+    public let deviceContactsNumbers: Set<String>
     public let isStandalone: Bool
     
     public init(
@@ -81,6 +82,7 @@ public final class ChatMessageItemAssociatedData: Equatable {
         recommendedChannels: RecommendedChannels? = nil,
         audioTranscriptionTrial: AudioTranscription.TrialState = .defaultValue,
         chatThemes: [TelegramTheme] = [],
+        deviceContactsNumbers: Set<String> = Set(),
         isStandalone: Bool = false
     ) {
         self.automaticDownloadPeerType = automaticDownloadPeerType
@@ -108,6 +110,7 @@ public final class ChatMessageItemAssociatedData: Equatable {
         self.recommendedChannels = recommendedChannels
         self.audioTranscriptionTrial = audioTranscriptionTrial
         self.chatThemes = chatThemes
+        self.deviceContactsNumbers = deviceContactsNumbers
         self.isStandalone = isStandalone
     }
     
@@ -184,6 +187,9 @@ public final class ChatMessageItemAssociatedData: Equatable {
         if lhs.chatThemes != rhs.chatThemes {
             return false
         }
+        if lhs.deviceContactsNumbers != rhs.deviceContactsNumbers {
+            return false
+        }
         if lhs.isStandalone != rhs.isStandalone {
             return false
         }
diff --git a/submodules/Camera/Sources/Camera.swift b/submodules/Camera/Sources/Camera.swift
index 08f7aa34bf..eef54e9abb 100644
--- a/submodules/Camera/Sources/Camera.swift
+++ b/submodules/Camera/Sources/Camera.swift
@@ -50,11 +50,11 @@ final class CameraDeviceContext {
     let input = CameraInput()
     let output: CameraOutput
     
-    init(session: CameraSession, exclusive: Bool, additional: Bool, ciContext: CIContext) {
+    init(session: CameraSession, exclusive: Bool, additional: Bool, ciContext: CIContext, use32BGRA: Bool = false) {
         self.session = session
         self.exclusive = exclusive
         self.additional = additional
-        self.output = CameraOutput(exclusive: exclusive, ciContext: ciContext)
+        self.output = CameraOutput(exclusive: exclusive, ciContext: ciContext, use32BGRA: use32BGRA)
     }
     
     func configure(position: Camera.Position, previewView: CameraSimplePreviewView?, audio: Bool, photo: Bool, metadata: Bool, preferWide: Bool = false, preferLowerFramerate: Bool = false) {
@@ -288,7 +288,6 @@ private final class CameraContext {
     private var micLevelPeak: Int16 = 0
     private var micLevelPeakCount = 0
 
-    
     private var isDualCameraEnabled: Bool?
     public func setDualCameraEnabled(_ enabled: Bool, change: Bool = true) {
         guard enabled != self.isDualCameraEnabled else {
@@ -303,10 +302,10 @@ private final class CameraContext {
         if enabled {
             self.configure {
                 self.mainDeviceContext?.invalidate()
-                self.mainDeviceContext = CameraDeviceContext(session: self.session, exclusive: false, additional: false, ciContext: self.ciContext)
+                self.mainDeviceContext = CameraDeviceContext(session: self.session, exclusive: false, additional: false, ciContext: self.ciContext, use32BGRA: self.initialConfiguration.isRoundVideo)
                 self.mainDeviceContext?.configure(position: .back, previewView: self.simplePreviewView, audio: self.initialConfiguration.audio, photo: self.initialConfiguration.photo, metadata: self.initialConfiguration.metadata)
             
-                self.additionalDeviceContext = CameraDeviceContext(session: self.session, exclusive: false, additional: true, ciContext: self.ciContext)
+                self.additionalDeviceContext = CameraDeviceContext(session: self.session, exclusive: false, additional: true, ciContext: self.ciContext, use32BGRA: self.initialConfiguration.isRoundVideo)
                 self.additionalDeviceContext?.configure(position: .front, previewView: self.secondaryPreviewView, audio: false, photo: true, metadata: false)
             }
             self.mainDeviceContext?.output.processSampleBuffer = { [weak self] sampleBuffer, pixelBuffer, connection in
@@ -343,7 +342,7 @@ private final class CameraContext {
                 self.additionalDeviceContext?.invalidate()
                 self.additionalDeviceContext = nil
                 
-                self.mainDeviceContext = CameraDeviceContext(session: self.session, exclusive: true, additional: false, ciContext: self.ciContext)
+                self.mainDeviceContext = CameraDeviceContext(session: self.session, exclusive: true, additional: false, ciContext: self.ciContext, use32BGRA: false)
                 self.mainDeviceContext?.configure(position: self.positionValue, previewView: self.simplePreviewView, audio: self.initialConfiguration.audio, photo: self.initialConfiguration.photo, metadata: self.initialConfiguration.metadata, preferWide: self.initialConfiguration.preferWide, preferLowerFramerate: self.initialConfiguration.preferLowerFramerate)
             }
             self.mainDeviceContext?.output.processSampleBuffer = { [weak self] sampleBuffer, pixelBuffer, connection in
@@ -476,6 +475,10 @@ private final class CameraContext {
         self.mainDeviceContext?.device.setZoomDelta(zoomDelta)
     }
     
+    func rampZoom(_ zoomLevel: CGFloat, rate: CGFloat) {
+        self.mainDeviceContext?.device.rampZoom(zoomLevel, rate: rate)
+    }
+    
     func takePhoto() -> Signal<PhotoCaptureResult, NoError> {
         guard let mainDeviceContext = self.mainDeviceContext else {
             return .complete()
@@ -509,15 +512,19 @@ private final class CameraContext {
         mainDeviceContext.device.setTorchMode(self._flashMode)
         
         let orientation = self.simplePreviewView?.videoPreviewLayer.connection?.videoOrientation ?? .portrait
-        if let additionalDeviceContext = self.additionalDeviceContext {
-            return combineLatest(
-                mainDeviceContext.output.startRecording(isDualCamera: true, position: self.positionValue, orientation: orientation),
-                additionalDeviceContext.output.startRecording(isDualCamera: true, orientation: .portrait)
-            ) |> map { value, _ in
-                return value
-            }
+        if self.initialConfiguration.isRoundVideo {
+            return mainDeviceContext.output.startRecording(mode: .roundVideo, orientation: .portrait, additionalOutput: self.additionalDeviceContext?.output)
         } else {
-            return mainDeviceContext.output.startRecording(isDualCamera: false, orientation: orientation)
+            if let additionalDeviceContext = self.additionalDeviceContext {
+                return combineLatest(
+                    mainDeviceContext.output.startRecording(mode: .dualCamera, position: self.positionValue, orientation: orientation),
+                    additionalDeviceContext.output.startRecording(mode: .dualCamera, orientation: .portrait)
+                ) |> map { value, _ in
+                    return value
+                }
+            } else {
+                return mainDeviceContext.output.startRecording(mode: .default, orientation: orientation)
+            }
         }
     }
     
@@ -525,41 +532,12 @@ private final class CameraContext {
         guard let mainDeviceContext = self.mainDeviceContext else {
             return .complete()
         }
-        if let additionalDeviceContext = self.additionalDeviceContext {
-            return combineLatest(
-                mainDeviceContext.output.stopRecording(),
-                additionalDeviceContext.output.stopRecording()
-            ) |> mapToSignal { main, additional in
-                if case let .finished(mainResult, _, duration, positionChangeTimestamps, _) = main, case let .finished(additionalResult, _, _, _, _) = additional {
-                    var additionalThumbnailImage = additionalResult.thumbnail
-                    if let cgImage = additionalResult.thumbnail.cgImage {
-                        additionalThumbnailImage = UIImage(cgImage: cgImage, scale: 1.0, orientation: .leftMirrored)
-                    }
-                  
-                    return .single(
-                        .finished(
-                            main: mainResult,
-                            additional: VideoCaptureResult.Result(path: additionalResult.path, thumbnail: additionalThumbnailImage, isMirrored: true, dimensions: additionalResult.dimensions),
-                            duration: duration,
-                            positionChangeTimestamps: positionChangeTimestamps,
-                            captureTimestamp: CACurrentMediaTime()
-                        )
-                    )
-                } else {
-                    return .complete()
-                }
-            }
-        } else {
-            let isMirrored = self.positionValue == .front
+        if self.initialConfiguration.isRoundVideo {
             return mainDeviceContext.output.stopRecording()
             |> map { result -> VideoCaptureResult in
                 if case let .finished(mainResult, _, duration, positionChangeTimestamps, captureTimestamp) = result {
-                    var thumbnailImage = mainResult.thumbnail
-                    if isMirrored, let cgImage = thumbnailImage.cgImage {
-                        thumbnailImage = UIImage(cgImage: cgImage, scale: 1.0, orientation: .leftMirrored)
-                    }
                     return .finished(
-                        main: VideoCaptureResult.Result(path: mainResult.path, thumbnail: thumbnailImage, isMirrored: isMirrored, dimensions: mainResult.dimensions),
+                        main: mainResult,
                         additional: nil,
                         duration: duration,
                         positionChangeTimestamps: positionChangeTimestamps,
@@ -569,6 +547,52 @@ private final class CameraContext {
                     return result
                 }
             }
+        } else {
+            if let additionalDeviceContext = self.additionalDeviceContext {
+                return combineLatest(
+                    mainDeviceContext.output.stopRecording(),
+                    additionalDeviceContext.output.stopRecording()
+                ) |> mapToSignal { main, additional in
+                    if case let .finished(mainResult, _, duration, positionChangeTimestamps, _) = main, case let .finished(additionalResult, _, _, _, _) = additional {
+                        var additionalThumbnailImage = additionalResult.thumbnail
+                        if let cgImage = additionalResult.thumbnail.cgImage {
+                            additionalThumbnailImage = UIImage(cgImage: cgImage, scale: 1.0, orientation: .leftMirrored)
+                        }
+                        
+                        return .single(
+                            .finished(
+                                main: mainResult,
+                                additional: VideoCaptureResult.Result(path: additionalResult.path, thumbnail: additionalThumbnailImage, isMirrored: true, dimensions: additionalResult.dimensions),
+                                duration: duration,
+                                positionChangeTimestamps: positionChangeTimestamps,
+                                captureTimestamp: CACurrentMediaTime()
+                            )
+                        )
+                    } else {
+                        return .complete()
+                    }
+                }
+            } else {
+                let isMirrored = self.positionValue == .front
+                return mainDeviceContext.output.stopRecording()
+                |> map { result -> VideoCaptureResult in
+                    if case let .finished(mainResult, _, duration, positionChangeTimestamps, captureTimestamp) = result {
+                        var thumbnailImage = mainResult.thumbnail
+                        if isMirrored, let cgImage = thumbnailImage.cgImage {
+                            thumbnailImage = UIImage(cgImage: cgImage, scale: 1.0, orientation: .leftMirrored)
+                        }
+                        return .finished(
+                            main: VideoCaptureResult.Result(path: mainResult.path, thumbnail: thumbnailImage, isMirrored: isMirrored, dimensions: mainResult.dimensions),
+                            additional: nil,
+                            duration: duration,
+                            positionChangeTimestamps: positionChangeTimestamps,
+                            captureTimestamp: captureTimestamp
+                        )
+                    } else {
+                        return result
+                    }
+                }
+            }
         }
     }
     
@@ -619,8 +643,9 @@ public final class Camera {
         let preferWide: Bool
         let preferLowerFramerate: Bool
         let reportAudioLevel: Bool
+        let isRoundVideo: Bool
         
-        public init(preset: Preset, position: Position, isDualEnabled: Bool = false, audio: Bool, photo: Bool, metadata: Bool, preferWide: Bool = false, preferLowerFramerate: Bool = false, reportAudioLevel: Bool = false) {
+        public init(preset: Preset, position: Position, isDualEnabled: Bool = false, audio: Bool, photo: Bool, metadata: Bool, preferWide: Bool = false, preferLowerFramerate: Bool = false, reportAudioLevel: Bool = false, isRoundVideo: Bool = false) {
             self.preset = preset
             self.position = position
             self.isDualEnabled = isDualEnabled
@@ -630,6 +655,7 @@ public final class Camera {
             self.preferWide = preferWide
             self.preferLowerFramerate = preferLowerFramerate
             self.reportAudioLevel = reportAudioLevel
+            self.isRoundVideo = isRoundVideo
         }
     }
     
@@ -822,6 +848,14 @@ public final class Camera {
         }
     }
     
+    public func rampZoom(_ zoomLevel: CGFloat, rate: CGFloat) {
+        self.queue.async {
+            if let context = self.contextRef?.takeUnretainedValue() {
+                context.rampZoom(zoomLevel, rate: rate)
+            }
+        }
+    }
+    
     public func setTorchActive(_ active: Bool) {
         self.queue.async {
             if let context = self.contextRef?.takeUnretainedValue() {
diff --git a/submodules/Camera/Sources/CameraDevice.swift b/submodules/Camera/Sources/CameraDevice.swift
index 691f9c87bf..139d429b50 100644
--- a/submodules/Camera/Sources/CameraDevice.swift
+++ b/submodules/Camera/Sources/CameraDevice.swift
@@ -313,6 +313,15 @@ final class CameraDevice {
         }
     }
     
+    func rampZoom(_ zoomLevel: CGFloat, rate: CGFloat) {
+        guard let device = self.videoDevice else {
+            return
+        }
+        self.transaction(device) { device in
+            device.ramp(toVideoZoomFactor: zoomLevel, withRate: Float(rate))
+        }
+    }
+    
     func resetZoom(neutral: Bool = true) {
         guard let device = self.videoDevice else {
             return
diff --git a/submodules/Camera/Sources/CameraOutput.swift b/submodules/Camera/Sources/CameraOutput.swift
index 4635a36c51..618cc71de7 100644
--- a/submodules/Camera/Sources/CameraOutput.swift
+++ b/submodules/Camera/Sources/CameraOutput.swift
@@ -80,6 +80,7 @@ public struct CameraCode: Equatable {
 final class CameraOutput: NSObject {
     let exclusive: Bool
     let ciContext: CIContext
+    let isVideoMessage: Bool
     
     let photoOutput = AVCapturePhotoOutput()
     let videoOutput = AVCaptureVideoDataOutput()
@@ -89,6 +90,8 @@ final class CameraOutput: NSObject {
     private var photoConnection: AVCaptureConnection?
     private var videoConnection: AVCaptureConnection?
     private var previewConnection: AVCaptureConnection?
+
+    private var roundVideoFilter: CameraRoundVideoFilter?
     
     private let queue = DispatchQueue(label: "")
     private let metadataQueue = DispatchQueue(label: "")
@@ -99,10 +102,11 @@ final class CameraOutput: NSObject {
     var processSampleBuffer: ((CMSampleBuffer, CVImageBuffer, AVCaptureConnection) -> Void)?
     var processAudioBuffer: ((CMSampleBuffer) -> Void)?
     var processCodes: (([CameraCode]) -> Void)?
-    
-    init(exclusive: Bool, ciContext: CIContext) {
+        
+    init(exclusive: Bool, ciContext: CIContext, use32BGRA: Bool = false) {
         self.exclusive = exclusive
         self.ciContext = ciContext
+        self.isVideoMessage = use32BGRA
         
         super.init()
 
@@ -111,7 +115,7 @@ final class CameraOutput: NSObject {
         }
         
         self.videoOutput.alwaysDiscardsLateVideoFrames = false
-        self.videoOutput.videoSettings = [kCVPixelBufferPixelFormatTypeKey: kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange] as [String : Any]
+        self.videoOutput.videoSettings = [kCVPixelBufferPixelFormatTypeKey: use32BGRA ? kCVPixelFormatType_32BGRA : kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange] as [String : Any]
     }
     
     deinit {
@@ -224,6 +228,7 @@ final class CameraOutput: NSObject {
         if let videoDataOutputConnection = self.videoOutput.connection(with: .video) {
             if videoDataOutputConnection.isVideoStabilizationSupported {
                 videoDataOutputConnection.preferredVideoStabilizationMode = .standard
+//                videoDataOutputConnection.preferredVideoStabilizationMode = self.isVideoMessage ? .cinematic : .standard
             }
         }
     }
@@ -282,68 +287,95 @@ final class CameraOutput: NSObject {
         return self.videoRecorder != nil
     }
     
+    enum RecorderMode {
+        case `default`
+        case roundVideo
+        case dualCamera
+    }
+    
+    private var currentMode: RecorderMode = .default
     private var recordingCompletionPipe = ValuePipe<VideoCaptureResult>()
-    func startRecording(isDualCamera: Bool, position: Camera.Position? = nil, orientation: AVCaptureVideoOrientation) -> Signal<Double, NoError> {
+    func startRecording(mode: RecorderMode, position: Camera.Position? = nil, orientation: AVCaptureVideoOrientation, additionalOutput: CameraOutput? = nil) -> Signal<Double, NoError> {
         guard self.videoRecorder == nil else {
             return .complete()
         }
         
+        self.currentMode = mode
+        
         let codecType: AVVideoCodecType
-        if hasHEVCHardwareEncoder {
-            codecType = .hevc
-        } else {
+        if case .roundVideo = mode {
             codecType = .h264
+        } else {
+            if hasHEVCHardwareEncoder {
+                codecType = .hevc
+            } else {
+                codecType = .h264
+            }
         }
         
-        guard let videoSettings = self.videoOutput.recommendedVideoSettings(forVideoCodecType: codecType, assetWriterOutputFileType: .mp4) else {
+        guard var videoSettings = self.videoOutput.recommendedVideoSettings(forVideoCodecType: codecType, assetWriterOutputFileType: .mp4) else {
             return .complete()
         }
-        let audioSettings = self.audioOutput.recommendedAudioSettingsForAssetWriter(writingTo: .mp4) ?? [:]
         
         var dimensions: CGSize = CGSize(width: 1080, height: 1920)
-        if orientation == .landscapeLeft {
-            dimensions = CGSize(width: 1920, height: 1080)
-        } else if orientation == .landscapeRight {
+        if orientation == .landscapeLeft || orientation == .landscapeRight {
             dimensions = CGSize(width: 1920, height: 1080)
         }
+        var orientation = orientation
+        if case .roundVideo = mode {
+            videoSettings[AVVideoWidthKey] = 400
+            videoSettings[AVVideoHeightKey] = 400
+            dimensions = CGSize(width: 400, height: 400)
+            orientation = .landscapeRight
+        }
+        
+        let audioSettings = self.audioOutput.recommendedAudioSettingsForAssetWriter(writingTo: .mp4) ?? [:]
         
         let outputFileName = NSUUID().uuidString
         let outputFilePath = NSTemporaryDirectory() + outputFileName + ".mp4"
         let outputFileURL = URL(fileURLWithPath: outputFilePath)
         
-        let videoRecorder = VideoRecorder(configuration: VideoRecorder.Configuration(videoSettings: videoSettings, audioSettings: audioSettings), ciContext: self.ciContext, orientation: orientation, fileUrl: outputFileURL, completion: { [weak self] result in
-            guard let self else {
-                return
-            }
-            if case let .success(transitionImage, duration, positionChangeTimestamps) = result {
-                self.recordingCompletionPipe.putNext(
-                    .finished(
-                        main: VideoCaptureResult.Result(
-                            path: outputFilePath,
-                            thumbnail: transitionImage ?? UIImage(),
-                            isMirrored: false,
-                            dimensions: dimensions
-                        ),
-                        additional: nil,
-                        duration: duration,
-                        positionChangeTimestamps: positionChangeTimestamps.map { ($0 == .front, $1) },
-                        captureTimestamp: CACurrentMediaTime()
+        let videoRecorder = VideoRecorder(
+            configuration: VideoRecorder.Configuration(videoSettings: videoSettings, audioSettings: audioSettings),
+            ciContext: self.ciContext,
+            orientation: orientation,
+            fileUrl: outputFileURL,
+            completion: { [weak self] result in
+                guard let self else {
+                    return
+                }
+                if case let .success(transitionImage, duration, positionChangeTimestamps) = result {
+                    self.recordingCompletionPipe.putNext(
+                        .finished(
+                            main: VideoCaptureResult.Result(
+                                path: outputFilePath,
+                                thumbnail: transitionImage ?? UIImage(),
+                                isMirrored: false,
+                                dimensions: dimensions
+                            ),
+                            additional: nil,
+                            duration: duration,
+                            positionChangeTimestamps: positionChangeTimestamps.map { ($0 == .front, $1) },
+                            captureTimestamp: CACurrentMediaTime()
+                        )
                     )
-                )
-            } else {
-                self.recordingCompletionPipe.putNext(.failed)
+                } else {
+                    self.recordingCompletionPipe.putNext(.failed)
+                }
             }
-        })
+        )
         
         videoRecorder?.start()
         self.videoRecorder = videoRecorder
         
-        if isDualCamera, let position {
+        if case .dualCamera = mode, let position {
             videoRecorder?.markPositionChange(position: position, time: .zero)
+        } else if case .roundVideo = mode {
+            additionalOutput?.masterOutput = self
         }
         
         return Signal { subscriber in
-            let timer = SwiftSignalKit.Timer(timeout: 0.1, repeat: true, completion: { [weak videoRecorder] in
+            let timer = SwiftSignalKit.Timer(timeout: 0.02, repeat: true, completion: { [weak videoRecorder] in
                 subscriber.putNext(videoRecorder?.duration ?? 0.0)
             }, queue: Queue.mainQueue())
             timer.start()
@@ -367,7 +399,86 @@ final class CameraOutput: NSObject {
         }
     }
     
+    private weak var masterOutput: CameraOutput?
+    func processVideoRecording(_ sampleBuffer: CMSampleBuffer, fromAdditionalOutput: Bool) {
+        if let videoRecorder = self.videoRecorder, videoRecorder.isRecording {
+            if case .roundVideo = self.currentMode {
+                if let processedSampleBuffer = self.processRoundVideoSampleBuffer(sampleBuffer, mirror: fromAdditionalOutput) {
+                    if case .front = self.currentPosition {
+                        if fromAdditionalOutput {
+                            videoRecorder.appendSampleBuffer(processedSampleBuffer)
+                        }
+                    } else {
+                        if !fromAdditionalOutput {
+                            videoRecorder.appendSampleBuffer(processedSampleBuffer)
+                        }
+                    }
+                } else {
+                    videoRecorder.appendSampleBuffer(sampleBuffer)
+                }
+            } else {
+                videoRecorder.appendSampleBuffer(sampleBuffer)
+            }
+        }
+    }
+    
+    private func processRoundVideoSampleBuffer(_ sampleBuffer: CMSampleBuffer, mirror: Bool) -> CMSampleBuffer? {
+        guard let videoPixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer), let formatDescription = CMSampleBufferGetFormatDescription(sampleBuffer) else {
+            return nil
+        }
+        let mediaSubType = CMFormatDescriptionGetMediaSubType(formatDescription)
+        let extensions = CMFormatDescriptionGetExtensions(formatDescription) as! [String: Any]
+        
+        var updatedExtensions = extensions
+        updatedExtensions["CVBytesPerRow"] = 400 * 4
+        
+        var newFormatDescription: CMFormatDescription?
+        var status = CMVideoFormatDescriptionCreate(allocator: nil, codecType: mediaSubType, width: 400, height: 400, extensions: updatedExtensions as CFDictionary, formatDescriptionOut: &newFormatDescription)
+        guard status == noErr, let newFormatDescription else {
+            return nil
+        }
+        
+        let filter: CameraRoundVideoFilter
+        if let current = self.roundVideoFilter {
+            filter = current
+        } else {
+            filter = CameraRoundVideoFilter(ciContext: self.ciContext)
+            self.roundVideoFilter = filter
+        }
+        if !filter.isPrepared {
+            filter.prepare(with: newFormatDescription, outputRetainedBufferCountHint: 3)
+        }
+        guard let newPixelBuffer = filter.render(pixelBuffer: videoPixelBuffer, mirror: mirror) else {
+            return nil
+        }
+        
+        var sampleTimingInfo: CMSampleTimingInfo = .invalid
+        CMSampleBufferGetSampleTimingInfo(sampleBuffer, at: 0, timingInfoOut: &sampleTimingInfo)
+        
+        var newSampleBuffer: CMSampleBuffer?
+        status = CMSampleBufferCreateForImageBuffer(
+            allocator: kCFAllocatorDefault,
+            imageBuffer: newPixelBuffer,
+            dataReady: true,
+            makeDataReadyCallback: nil,
+            refcon: nil,
+            formatDescription: newFormatDescription,
+            sampleTiming: &sampleTimingInfo,
+            sampleBufferOut: &newSampleBuffer
+        )
+        
+        if status == noErr, let newSampleBuffer {
+            return newSampleBuffer
+        }
+        return nil
+    }
+    
+    private var currentPosition: Camera.Position = .front
+    private var lastSwitchTimestamp: Double = 0.0
+   
     func markPositionChange(position: Camera.Position) {
+        self.currentPosition = position
+        
         if let videoRecorder = self.videoRecorder {
             videoRecorder.markPositionChange(position: position)
         }
@@ -386,8 +497,10 @@ extension CameraOutput: AVCaptureVideoDataOutputSampleBufferDelegate, AVCaptureA
 //            self.processAudioBuffer?(sampleBuffer)
         }
         
-        if let videoRecorder = self.videoRecorder, videoRecorder.isRecording {
-            videoRecorder.appendSampleBuffer(sampleBuffer)
+        if let masterOutput = self.masterOutput {
+            masterOutput.processVideoRecording(sampleBuffer, fromAdditionalOutput: true)
+        } else {
+            self.processVideoRecording(sampleBuffer, fromAdditionalOutput: false)
         }
     }
     
diff --git a/submodules/Camera/Sources/CameraRoundVideoFilter.swift b/submodules/Camera/Sources/CameraRoundVideoFilter.swift
new file mode 100644
index 0000000000..e41911070d
--- /dev/null
+++ b/submodules/Camera/Sources/CameraRoundVideoFilter.swift
@@ -0,0 +1,181 @@
+import Foundation
+import UIKit
+import CoreImage
+import CoreMedia
+import CoreVideo
+import Metal
+import Display
+
+func allocateOutputBufferPool(with inputFormatDescription: CMFormatDescription, outputRetainedBufferCountHint: Int) -> (
+    outputBufferPool: CVPixelBufferPool?,
+    outputColorSpace: CGColorSpace?,
+    outputFormatDescription: CMFormatDescription?) {
+        let inputMediaSubType = CMFormatDescriptionGetMediaSubType(inputFormatDescription)
+        if inputMediaSubType != kCVPixelFormatType_32BGRA {
+            return (nil, nil, nil)
+        }
+        
+        let inputDimensions = CMVideoFormatDescriptionGetDimensions(inputFormatDescription)
+        var pixelBufferAttributes: [String: Any] = [
+            kCVPixelBufferPixelFormatTypeKey as String: UInt(inputMediaSubType),
+            kCVPixelBufferWidthKey as String: Int(inputDimensions.width),
+            kCVPixelBufferHeightKey as String: Int(inputDimensions.height),
+            kCVPixelBufferIOSurfacePropertiesKey as String: [:] as NSDictionary
+        ]
+        
+        var cgColorSpace = CGColorSpaceCreateDeviceRGB()
+        if let inputFormatDescriptionExtension = CMFormatDescriptionGetExtensions(inputFormatDescription) as Dictionary? {
+            let colorPrimaries = inputFormatDescriptionExtension[kCVImageBufferColorPrimariesKey]
+            
+            if let colorPrimaries = colorPrimaries {
+                var colorSpaceProperties: [String: AnyObject] = [kCVImageBufferColorPrimariesKey as String: colorPrimaries]
+                
+                if let yCbCrMatrix = inputFormatDescriptionExtension[kCVImageBufferYCbCrMatrixKey] {
+                    colorSpaceProperties[kCVImageBufferYCbCrMatrixKey as String] = yCbCrMatrix
+                }
+                
+                if let transferFunction = inputFormatDescriptionExtension[kCVImageBufferTransferFunctionKey] {
+                    colorSpaceProperties[kCVImageBufferTransferFunctionKey as String] = transferFunction
+                }
+                
+                pixelBufferAttributes[kCVBufferPropagatedAttachmentsKey as String] = colorSpaceProperties
+            }
+            
+            if let cvColorspace = inputFormatDescriptionExtension[kCVImageBufferCGColorSpaceKey] {
+                cgColorSpace = cvColorspace as! CGColorSpace
+            } else if (colorPrimaries as? String) == (kCVImageBufferColorPrimaries_P3_D65 as String) {
+                cgColorSpace = CGColorSpace(name: CGColorSpace.displayP3)!
+            }
+        }
+        
+        let poolAttributes = [kCVPixelBufferPoolMinimumBufferCountKey as String: outputRetainedBufferCountHint]
+        var cvPixelBufferPool: CVPixelBufferPool?
+        CVPixelBufferPoolCreate(kCFAllocatorDefault, poolAttributes as NSDictionary?, pixelBufferAttributes as NSDictionary?, &cvPixelBufferPool)
+        guard let pixelBufferPool = cvPixelBufferPool else {
+            return (nil, nil, nil)
+        }
+        
+        preallocateBuffers(pool: pixelBufferPool, allocationThreshold: outputRetainedBufferCountHint)
+        
+        var pixelBuffer: CVPixelBuffer?
+        var outputFormatDescription: CMFormatDescription?
+        let auxAttributes = [kCVPixelBufferPoolAllocationThresholdKey as String: outputRetainedBufferCountHint] as NSDictionary
+        CVPixelBufferPoolCreatePixelBufferWithAuxAttributes(kCFAllocatorDefault, pixelBufferPool, auxAttributes, &pixelBuffer)
+        if let pixelBuffer = pixelBuffer {
+            CMVideoFormatDescriptionCreateForImageBuffer(allocator: kCFAllocatorDefault,
+                                                         imageBuffer: pixelBuffer,
+                                                         formatDescriptionOut: &outputFormatDescription)
+        }
+        pixelBuffer = nil
+        
+        return (pixelBufferPool, cgColorSpace, outputFormatDescription)
+}
+
+private func preallocateBuffers(pool: CVPixelBufferPool, allocationThreshold: Int) {
+    var pixelBuffers = [CVPixelBuffer]()
+    var error: CVReturn = kCVReturnSuccess
+    let auxAttributes = [kCVPixelBufferPoolAllocationThresholdKey as String: allocationThreshold] as NSDictionary
+    var pixelBuffer: CVPixelBuffer?
+    while error == kCVReturnSuccess {
+        error = CVPixelBufferPoolCreatePixelBufferWithAuxAttributes(kCFAllocatorDefault, pool, auxAttributes, &pixelBuffer)
+        if let pixelBuffer = pixelBuffer {
+            pixelBuffers.append(pixelBuffer)
+        }
+        pixelBuffer = nil
+    }
+    pixelBuffers.removeAll()
+}
+
+class CameraRoundVideoFilter {
+    private let ciContext: CIContext
+    
+    private var resizeFilter: CIFilter?
+    private var compositeFilter: CIFilter?
+    
+    private var outputColorSpace: CGColorSpace?
+    private var outputPixelBufferPool: CVPixelBufferPool?
+    private(set) var outputFormatDescription: CMFormatDescription?
+    private(set) var inputFormatDescription: CMFormatDescription?
+    
+    private(set) var isPrepared = false
+    
+    init(ciContext: CIContext) {
+        self.ciContext = ciContext
+    }
+    
+    func prepare(with formatDescription: CMFormatDescription, outputRetainedBufferCountHint: Int) {
+        self.reset()
+        
+        (self.outputPixelBufferPool, self.outputColorSpace, self.outputFormatDescription) = allocateOutputBufferPool(with: formatDescription, outputRetainedBufferCountHint: outputRetainedBufferCountHint)
+        if self.outputPixelBufferPool == nil {
+            return
+        }
+        self.inputFormatDescription = formatDescription
+        
+        let diameter: CGFloat = 400.0
+        let circleImage = generateImage(CGSize(width: diameter, height: diameter), opaque: false, scale: 1.0, rotatedContext: { size, context in
+            let bounds = CGRect(origin: .zero, size: size)
+            context.clear(bounds)
+            context.setFillColor(UIColor.white.cgColor)
+            context.fill(bounds)
+            context.setBlendMode(.clear)
+            context.fillEllipse(in: bounds)
+        })!
+                
+        self.resizeFilter = CIFilter(name: "CILanczosScaleTransform")
+        
+        self.compositeFilter = CIFilter(name: "CISourceOverCompositing")
+        self.compositeFilter?.setValue(CIImage(image: circleImage), forKey: kCIInputImageKey)
+        
+        self.isPrepared = true
+    }
+    
+    func reset() {
+        self.resizeFilter = nil
+        self.compositeFilter = nil
+        self.outputColorSpace = nil
+        self.outputPixelBufferPool = nil
+        self.outputFormatDescription = nil
+        self.inputFormatDescription = nil
+        self.isPrepared = false
+    }
+    
+    func render(pixelBuffer: CVPixelBuffer, mirror: Bool) -> CVPixelBuffer? {
+        guard let resizeFilter = self.resizeFilter, let compositeFilter = self.compositeFilter, self.isPrepared else {
+            return nil
+        }
+        
+        var sourceImage = CIImage(cvImageBuffer: pixelBuffer)
+        sourceImage = sourceImage.oriented(mirror ? .leftMirrored : .right)
+        let scale = 400.0 / min(sourceImage.extent.width, sourceImage.extent.height)
+        
+        resizeFilter.setValue(sourceImage, forKey: kCIInputImageKey)
+        resizeFilter.setValue(scale, forKey: kCIInputScaleKey)
+        
+        if let resizedImage = resizeFilter.outputImage {
+            sourceImage = resizedImage
+        } else {
+            sourceImage = sourceImage.transformed(by: CGAffineTransformMakeScale(scale, scale), highQualityDownsample: true)
+        }
+        
+        sourceImage = sourceImage.transformed(by: CGAffineTransformMakeTranslation(0.0, -(sourceImage.extent.height - sourceImage.extent.width) / 2.0))
+        
+        sourceImage = sourceImage.cropped(to: CGRect(x: 0.0, y: 0.0, width: sourceImage.extent.width, height: sourceImage.extent.width))
+        
+        compositeFilter.setValue(sourceImage, forKey: kCIInputBackgroundImageKey)
+        
+        let finalImage = compositeFilter.outputImage
+        guard let finalImage else {
+            return nil
+        }
+        
+        var pbuf: CVPixelBuffer?
+        CVPixelBufferPoolCreatePixelBuffer(kCFAllocatorDefault, outputPixelBufferPool!, &pbuf)
+        guard let outputPixelBuffer = pbuf else {
+            return nil
+        }
+        
+        self.ciContext.render(finalImage, to: outputPixelBuffer, bounds: CGRect(origin: .zero, size: CGSize(width: 400, height: 400)), colorSpace: outputColorSpace)
+        return outputPixelBuffer
+    }
+}
diff --git a/submodules/Camera/Sources/VideoRecorder.swift b/submodules/Camera/Sources/VideoRecorder.swift
index 78dcff37a8..9215ea20b5 100644
--- a/submodules/Camera/Sources/VideoRecorder.swift
+++ b/submodules/Camera/Sources/VideoRecorder.swift
@@ -519,7 +519,7 @@ public final class VideoRecorder {
     func markPositionChange(position: Camera.Position, time: CMTime? = nil) {
         self.impl.markPositionChange(position: position, time: time)
     }
-    
+        
     func appendSampleBuffer(_ sampleBuffer: CMSampleBuffer) {
         guard let formatDescriptor = CMSampleBufferGetFormatDescription(sampleBuffer) else {
             return
diff --git a/submodules/ChatPresentationInterfaceState/Sources/ChatPresentationInterfaceState.swift b/submodules/ChatPresentationInterfaceState/Sources/ChatPresentationInterfaceState.swift
index 2809ca5db2..fd5a20f637 100644
--- a/submodules/ChatPresentationInterfaceState/Sources/ChatPresentationInterfaceState.swift
+++ b/submodules/ChatPresentationInterfaceState/Sources/ChatPresentationInterfaceState.swift
@@ -1,5 +1,6 @@
 import Foundation
 import UIKit
+import SwiftSignalKit
 import Postbox
 import TelegramCore
 import TelegramPresentationData
@@ -146,34 +147,87 @@ public struct ChatSearchData: Equatable {
     }
 }
 
-public final class ChatRecordedMediaPreview: Equatable {
-    public let resource: TelegramMediaResource
-    public let fileSize: Int32
-    public let duration: Int32
-    public let waveform: AudioWaveform
-    
-    public init(resource: TelegramMediaResource, duration: Int32, fileSize: Int32, waveform: AudioWaveform) {
-        self.resource = resource
-        self.duration = duration
-        self.fileSize = fileSize
-        self.waveform = waveform
+public enum ChatRecordedMediaPreview: Equatable {
+    public class Audio: Equatable {
+        public let resource: TelegramMediaResource
+        public let fileSize: Int32
+        public let duration: Int32
+        public let waveform: AudioWaveform
+        
+        public init(
+            resource: TelegramMediaResource,
+            fileSize: Int32,
+            duration: Int32,
+            waveform: AudioWaveform
+        ) {
+            self.resource = resource
+            self.fileSize = fileSize
+            self.duration = duration
+            self.waveform = waveform
+        }
+        
+        public static func ==(lhs: Audio, rhs: Audio) -> Bool {
+            if !lhs.resource.isEqual(to: rhs.resource) {
+                return false
+            }
+            if lhs.duration != rhs.duration {
+                return false
+            }
+            if lhs.fileSize != rhs.fileSize {
+                return false
+            }
+            if lhs.waveform != rhs.waveform {
+                return false
+            }
+            return true
+        }
     }
     
-    public static func ==(lhs: ChatRecordedMediaPreview, rhs: ChatRecordedMediaPreview) -> Bool {
-        if !lhs.resource.isEqual(to: rhs.resource) {
-            return false
+    public class Video: Equatable {
+        public class Control {
+            public let updateTrimRange: (Double, Double, Bool, Bool) -> Void
+            
+            public init(updateTrimRange: @escaping (Double, Double, Bool, Bool) -> Void) {
+                self.updateTrimRange = updateTrimRange
+            }
         }
-        if lhs.duration != rhs.duration {
-            return false
+        
+        public let duration: Int32
+        public let frames: [UIImage]
+        public let framesUpdateTimestamp: Double
+        public let trimRange: Range<Double>?
+        public let control: Control
+        
+        public init(
+            duration: Int32,
+            frames: [UIImage],
+            framesUpdateTimestamp: Double,
+            trimRange: Range<Double>?,
+            control: Control
+        ) {
+            self.duration = duration
+            self.frames = frames
+            self.framesUpdateTimestamp = framesUpdateTimestamp
+            self.trimRange = trimRange
+            self.control = control
         }
-        if lhs.fileSize != rhs.fileSize {
-            return false
+        
+        public static func ==(lhs: Video, rhs: Video) -> Bool {
+            if lhs.duration != rhs.duration {
+                return false
+            }
+            if lhs.framesUpdateTimestamp != rhs.framesUpdateTimestamp {
+                return false
+            }
+            if lhs.trimRange != rhs.trimRange {
+                return false
+            }
+            return true
         }
-        if lhs.waveform != rhs.waveform {
-            return false
-        }
-        return true
     }
+    
+    case audio(Audio)
+    case video(Video)
 }
 
 public struct ChatContactStatus: Equatable {
diff --git a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernConversationInputMicButton.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernConversationInputMicButton.h
index 94e5eff7d9..ed78e3cbef 100644
--- a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernConversationInputMicButton.h
+++ b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernConversationInputMicButton.h
@@ -87,8 +87,6 @@
 
 - (void)_commitLocked;
 
-- (void)lockImmediately;
-
 - (void)setHidesPanelOnLock;
 - (UIView *)createLockPanelView;
 
diff --git a/submodules/LegacyComponents/Sources/TGModernConversationInputMicButton.m b/submodules/LegacyComponents/Sources/TGModernConversationInputMicButton.m
index 501866d959..8f6ea3a6d1 100644
--- a/submodules/LegacyComponents/Sources/TGModernConversationInputMicButton.m
+++ b/submodules/LegacyComponents/Sources/TGModernConversationInputMicButton.m
@@ -602,33 +602,6 @@ static const CGFloat outerCircleMinScale = innerCircleRadius / outerCircleRadius
     return iconImage;
 }
 
-- (void)lockImmediately {
-    _lockView.lockness = 1.0;
-    [_lock updateLockness:1.0];
-    
-    UIImage *icon = TGComponentsImageNamed(@"RecordSendIcon");
-    [self setIcon:TGTintedImage(icon, _pallete != nil && !_hidesPanelOnLock ? _pallete.iconColor : [UIColor whiteColor])];
-    
-    _currentScale = 1;
-    _cancelTargetTranslation = 0;
-    
-    id<TGModernConversationInputMicButtonDelegate> delegate = _delegate;
-    if ([delegate respondsToSelector:@selector(micButtonInteractionUpdateCancelTranslation:)])
-        [delegate micButtonInteractionUpdateCancelTranslation:-_cancelTargetTranslation];
-    
-    _lockPanelView.frame = CGRectMake(_lockPanelView.frame.origin.x, 40.0f, _lockPanelView.frame.size.width, 72.0f - 32.0f);
-    _lockView.transform = CGAffineTransformMakeTranslation(0.0f, -11.0f);
-    _lock.transform = CGAffineTransformMakeTranslation(0.0f, -16.0f);
-    _lockArrowView.transform = CGAffineTransformMakeTranslation(0.0f, -39.0f);
-    _lockArrowView.alpha = 0.0f;
-    
-    _stopButton.userInteractionEnabled = true;
-    [UIView animateWithDuration:0.25 delay:0.56 options:kNilOptions animations:^
-    {
-        _stopButton.alpha = 1.0f;
-    } completion:nil];
-}
-
 - (void)animateLock {
     if (!_animatedIn) {
         return;
diff --git a/submodules/LocalMediaResources/Sources/MediaResources.swift b/submodules/LocalMediaResources/Sources/MediaResources.swift
index a6f87f3f19..779fbdc2c1 100644
--- a/submodules/LocalMediaResources/Sources/MediaResources.swift
+++ b/submodules/LocalMediaResources/Sources/MediaResources.swift
@@ -9,7 +9,7 @@ public final class VideoMediaResourceAdjustments: PostboxCoding, Equatable {
     public let digest: MemoryBuffer
     public let isStory: Bool
     
-    public init(data: MemoryBuffer, digest: MemoryBuffer, isStory: Bool) {
+    public init(data: MemoryBuffer, digest: MemoryBuffer, isStory: Bool = false) {
         self.data = data
         self.digest = digest
         self.isStory = isStory
@@ -161,7 +161,7 @@ public final class LocalFileVideoMediaResource: TelegramMediaResource {
     }
     
     public let randomId: Int64
-    public let path: String
+    public let paths: [String]
     public let adjustments: VideoMediaResourceAdjustments?
     
     public var headerSize: Int32 {
@@ -170,19 +170,30 @@ public final class LocalFileVideoMediaResource: TelegramMediaResource {
     
     public init(randomId: Int64, path: String, adjustments: VideoMediaResourceAdjustments?) {
         self.randomId = randomId
-        self.path = path
+        self.paths = [path]
+        self.adjustments = adjustments
+    }
+    
+    public init(randomId: Int64, paths: [String], adjustments: VideoMediaResourceAdjustments?) {
+        self.randomId = randomId
+        self.paths = paths
         self.adjustments = adjustments
     }
     
     public required init(decoder: PostboxDecoder) {
         self.randomId = decoder.decodeInt64ForKey("i", orElse: 0)
-        self.path = decoder.decodeStringForKey("p", orElse: "")
+        let paths = decoder.decodeStringArrayForKey("ps")
+        if !paths.isEmpty {
+            self.paths = paths
+        } else {
+            self.paths = [decoder.decodeStringForKey("p", orElse: "")]
+        }
         self.adjustments = decoder.decodeObjectForKey("a", decoder: { VideoMediaResourceAdjustments(decoder: $0) }) as? VideoMediaResourceAdjustments
     }
     
     public func encode(_ encoder: PostboxEncoder) {
         encoder.encodeInt64(self.randomId, forKey: "i")
-        encoder.encodeString(self.path, forKey: "p")
+        encoder.encodeStringArray(self.paths, forKey: "ps")
         if let adjustments = self.adjustments {
             encoder.encodeObject(adjustments, forKey: "a")
         } else {
@@ -196,7 +207,7 @@ public final class LocalFileVideoMediaResource: TelegramMediaResource {
     
     public func isEqual(to: MediaResource) -> Bool {
         if let to = to as? LocalFileVideoMediaResource {
-            return self.randomId == to.randomId && self.path == to.path && self.adjustments == to.adjustments
+            return self.randomId == to.randomId && self.paths == to.paths && self.adjustments == to.adjustments
         } else {
             return false
         }
diff --git a/submodules/PremiumUI/BUILD b/submodules/PremiumUI/BUILD
index 83a13b2ba8..87af158f19 100644
--- a/submodules/PremiumUI/BUILD
+++ b/submodules/PremiumUI/BUILD
@@ -111,6 +111,7 @@ swift_library(
         "//submodules/InvisibleInkDustNode",
         "//submodules/AlertUI",
         "//submodules/TelegramUI/Components/Chat/MergedAvatarsNode",
+        "//submodules/TelegramUI/Components/LottieComponent",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/PremiumUI/Sources/PremiumPrivacyScreen.swift b/submodules/PremiumUI/Sources/PremiumPrivacyScreen.swift
index d8be589bc7..f8afc9b5b3 100644
--- a/submodules/PremiumUI/Sources/PremiumPrivacyScreen.swift
+++ b/submodules/PremiumUI/Sources/PremiumPrivacyScreen.swift
@@ -11,6 +11,7 @@ import BundleIconComponent
 import BalancedTextComponent
 import MultilineTextComponent
 import SolidRoundedButtonComponent
+import LottieComponent
 import AccountContext
 
 private final class SheetContent: CombinedComponent {
@@ -59,7 +60,7 @@ private final class SheetContent: CombinedComponent {
         let closeButton = Child(Button.self)
         
         let iconBackground = Child(Image.self)
-        let icon = Child(BundleIconComponent.self)
+        let icon = Child(LottieComponent.self)
         
         let title = Child(BalancedTextComponent.self)
         let text = Child(BalancedTextComponent.self)
@@ -106,13 +107,13 @@ private final class SheetContent: CombinedComponent {
             let peerName = "Name"
             switch component.subject {
             case .presence:
-                iconName = "Premium/PrivacyPresence"
+                iconName = "PremiumPrivacyPresence"
                 titleString = "Show Your Last Seen"
                 textString = "To see **\(peerName)'s** Last Seen time, either start showing your own Last Seen Time..."
                 buttonTitle = "Show My Last Seen to Everyone"
                 premiumString = "Subscription will let you see **\(peerName)'s** Last Seen status without showing yours."
             case .readTime:
-                iconName = "Premium/PrivacyReadTime"
+                iconName = "PremiumPrivacyRead"
                 titleString = "Show Your Read Date"
                 textString = "To see when **\(peerName)** read the message, either start showing your own read time:"
                 buttonTitle = "Show My Read Time"
@@ -162,11 +163,20 @@ private final class SheetContent: CombinedComponent {
                 .position(CGPoint(x: context.availableSize.width / 2.0, y: contentSize.height + iconBackground.size.height / 2.0))
             )
             
+//            let icon = icon.update(
+//                component: BundleIconComponent(name: iconName, tintColor: .white),
+//                availableSize: CGSize(width: 70.0, height: 70.0),
+//                transition: .immediate
+//            )
+            
             let icon = icon.update(
-                component: BundleIconComponent(name: iconName, tintColor: .white),
-                availableSize: CGSize(width: 70.0, height: 70.0),
+                component: LottieComponent(
+                    content: LottieComponent.AppBundleContent(name: iconName)
+                ),
+                availableSize: CGSize(width: 70, height: 70),
                 transition: .immediate
             )
+            
             context.add(icon
                 .position(CGPoint(x: context.availableSize.width / 2.0, y: contentSize.height + iconBackground.size.height / 2.0))
             )
diff --git a/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Combine.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Combine.swift
index e2a6db088d..27cab69423 100644
--- a/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Combine.swift
+++ b/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Combine.swift
@@ -208,6 +208,14 @@ public func combineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13
     }, initialValues: [:], queue: queue)
 }
 
+public func combineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, E>(queue: Queue? = nil, _ s1: Signal<T1, E>, _ s2: Signal<T2, E>, _ s3: Signal<T3, E>, _ s4: Signal<T4, E>, _ s5: Signal<T5, E>, _ s6: Signal<T6, E>, _ s7: Signal<T7, E>, _ s8: Signal<T8, E>, _ s9: Signal<T9, E>, _ s10: Signal<T10, E>, _ s11: Signal<T11, E>, _ s12: Signal<T12, E>, _ s13: Signal<T13, E>, _ s14: Signal<T14, E>, _ s15: Signal<T15, E>, _ s16: Signal<T16, E>, _ s17: Signal<T17, E>, _ s18: Signal<T18, E>, _ s19: Signal<T19, E>, _ s20: Signal<T20, E>, _ s21: Signal<T21, E>) -> Signal<(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21), E> {
+    return combineLatestAny([signalOfAny(s1), signalOfAny(s2), signalOfAny(s3), signalOfAny(s4), signalOfAny(s5), signalOfAny(s6), signalOfAny(s7), signalOfAny(s8), signalOfAny(s9), signalOfAny(s10), signalOfAny(s11), signalOfAny(s12), signalOfAny(s13), signalOfAny(s14), signalOfAny(s15), signalOfAny(s16), signalOfAny(s17), signalOfAny(s18), signalOfAny(s19), signalOfAny(s20), signalOfAny(s21)], combine: { values in
+        return (values[0] as! T1, values[1] as! T2, values[2] as! T3, values[3] as! T4, values[4] as! T5, values[5] as! T6, values[6] as! T7, values[7] as! T8, values[8] as! T9, values[9] as! T10, values[10] as! T11, values[11] as! T12, values[12] as! T13, values[13] as! T14, values[14] as! T15, values[15] as! T16, values[16] as! T17, values[17] as! T18, values[18] as! T19, values[19] as! T20, values[20] as! T21)
+    }, initialValues: [:], queue: queue)
+}
+
+
+
 public func combineLatest<T, E>(queue: Queue? = nil, _ signals: [Signal<T, E>]) -> Signal<[T], E> {
     if signals.count == 0 {
         return single([T](), E.self)
diff --git a/submodules/ScreenCaptureDetection/Sources/ScreenCaptureDetection.swift b/submodules/ScreenCaptureDetection/Sources/ScreenCaptureDetection.swift
index f0d89f73f6..167c304955 100644
--- a/submodules/ScreenCaptureDetection/Sources/ScreenCaptureDetection.swift
+++ b/submodules/ScreenCaptureDetection/Sources/ScreenCaptureDetection.swift
@@ -96,6 +96,10 @@ public final class ScreenCaptureDetectionManager {
                 guard let strongSelf = self else {
                     return
                 }
+                var value = value
+#if DEBUG
+                value = false
+#endif          
                 strongSelf.isRecordingActive = value
                 if value {
                     if strongSelf.screenRecordingCheckTimer == nil {
diff --git a/submodules/TelegramNotices/Sources/Notices.swift b/submodules/TelegramNotices/Sources/Notices.swift
index f450a51749..95dfbdca6b 100644
--- a/submodules/TelegramNotices/Sources/Notices.swift
+++ b/submodules/TelegramNotices/Sources/Notices.swift
@@ -192,6 +192,9 @@ private enum ApplicationSpecificGlobalNotice: Int32 {
     case voiceMessagesPlayOnceSuggestion = 58
     case incomingVoiceMessagePlayOnceTip = 59
     case outgoingVoiceMessagePlayOnceTip = 60
+    case videoMessagesPlayOnceSuggestion = 61
+    case incomingVideoMessagePlayOnceTip = 62
+    case outgoingVideoMessagePlayOnceTip = 63
     
     var key: ValueBoxKey {
         let v = ValueBoxKey(length: 4)
@@ -489,6 +492,18 @@ private struct ApplicationSpecificNoticeKeys {
     static func outgoingVoiceMessagePlayOnceTip() -> NoticeEntryKey {
         return NoticeEntryKey(namespace: noticeNamespace(namespace: globalNamespace), key: ApplicationSpecificGlobalNotice.outgoingVoiceMessagePlayOnceTip.key)
     }
+    
+    static func videoMessagesPlayOnceSuggestion() -> NoticeEntryKey {
+        return NoticeEntryKey(namespace: noticeNamespace(namespace: globalNamespace), key: ApplicationSpecificGlobalNotice.videoMessagesPlayOnceSuggestion.key)
+    }
+    
+    static func incomingVideoMessagePlayOnceTip() -> NoticeEntryKey {
+        return NoticeEntryKey(namespace: noticeNamespace(namespace: globalNamespace), key: ApplicationSpecificGlobalNotice.incomingVideoMessagePlayOnceTip.key)
+    }
+    
+    static func outgoingVideoMessagePlayOnceTip() -> NoticeEntryKey {
+        return NoticeEntryKey(namespace: noticeNamespace(namespace: globalNamespace), key: ApplicationSpecificGlobalNotice.outgoingVideoMessagePlayOnceTip.key)
+    }
 }
 
 public struct ApplicationSpecificNotice {
@@ -1984,4 +1999,85 @@ public struct ApplicationSpecificNotice {
             return Int(previousValue)
         }
     }
+    
+    public static func getVideoMessagesPlayOnceSuggestion(accountManager: AccountManager<TelegramAccountManagerTypes>) -> Signal<Int32, NoError> {
+        return accountManager.transaction { transaction -> Int32 in
+            if let value = transaction.getNotice(ApplicationSpecificNoticeKeys.videoMessagesPlayOnceSuggestion())?.get(ApplicationSpecificCounterNotice.self) {
+                return value.value
+            } else {
+                return 0
+            }
+        }
+    }
+    
+    public static func incrementVideoMessagesPlayOnceSuggestion(accountManager: AccountManager<TelegramAccountManagerTypes>, count: Int = 1) -> Signal<Int, NoError> {
+        return accountManager.transaction { transaction -> Int in
+            var currentValue: Int32 = 0
+            if let value = transaction.getNotice(ApplicationSpecificNoticeKeys.videoMessagesPlayOnceSuggestion())?.get(ApplicationSpecificCounterNotice.self) {
+                currentValue = value.value
+            }
+            let previousValue = currentValue
+            currentValue += Int32(count)
+
+            if let entry = CodableEntry(ApplicationSpecificCounterNotice(value: currentValue)) {
+                transaction.setNotice(ApplicationSpecificNoticeKeys.videoMessagesPlayOnceSuggestion(), entry)
+            }
+            
+            return Int(previousValue)
+        }
+    }
+    
+    public static func getIncomingVideoMessagePlayOnceTip(accountManager: AccountManager<TelegramAccountManagerTypes>) -> Signal<Int32, NoError> {
+        return accountManager.transaction { transaction -> Int32 in
+            if let value = transaction.getNotice(ApplicationSpecificNoticeKeys.incomingVideoMessagePlayOnceTip())?.get(ApplicationSpecificCounterNotice.self) {
+                return value.value
+            } else {
+                return 0
+            }
+        }
+    }
+    
+    public static func incrementIncomingVideoMessagePlayOnceTip(accountManager: AccountManager<TelegramAccountManagerTypes>, count: Int = 1) -> Signal<Int, NoError> {
+        return accountManager.transaction { transaction -> Int in
+            var currentValue: Int32 = 0
+            if let value = transaction.getNotice(ApplicationSpecificNoticeKeys.incomingVideoMessagePlayOnceTip())?.get(ApplicationSpecificCounterNotice.self) {
+                currentValue = value.value
+            }
+            let previousValue = currentValue
+            currentValue += Int32(count)
+
+            if let entry = CodableEntry(ApplicationSpecificCounterNotice(value: currentValue)) {
+                transaction.setNotice(ApplicationSpecificNoticeKeys.incomingVideoMessagePlayOnceTip(), entry)
+            }
+            
+            return Int(previousValue)
+        }
+    }
+    
+    public static func getOutgoingVideoMessagePlayOnceTip(accountManager: AccountManager<TelegramAccountManagerTypes>) -> Signal<Int32, NoError> {
+        return accountManager.transaction { transaction -> Int32 in
+            if let value = transaction.getNotice(ApplicationSpecificNoticeKeys.outgoingVideoMessagePlayOnceTip())?.get(ApplicationSpecificCounterNotice.self) {
+                return value.value
+            } else {
+                return 0
+            }
+        }
+    }
+    
+    public static func incrementOutgoingVideoMessagePlayOnceTip(accountManager: AccountManager<TelegramAccountManagerTypes>, count: Int = 1) -> Signal<Int, NoError> {
+        return accountManager.transaction { transaction -> Int in
+            var currentValue: Int32 = 0
+            if let value = transaction.getNotice(ApplicationSpecificNoticeKeys.outgoingVideoMessagePlayOnceTip())?.get(ApplicationSpecificCounterNotice.self) {
+                currentValue = value.value
+            }
+            let previousValue = currentValue
+            currentValue += Int32(count)
+
+            if let entry = CodableEntry(ApplicationSpecificCounterNotice(value: currentValue)) {
+                transaction.setNotice(ApplicationSpecificNoticeKeys.outgoingVideoMessagePlayOnceTip(), entry)
+            }
+            
+            return Int(previousValue)
+        }
+    }
 }
diff --git a/submodules/TelegramUI/BUILD b/submodules/TelegramUI/BUILD
index d05ee13e10..74761eb78f 100644
--- a/submodules/TelegramUI/BUILD
+++ b/submodules/TelegramUI/BUILD
@@ -422,6 +422,8 @@ swift_library(
         "//submodules/TelegramUI/Components/Chat/ChatMessageNotificationItem",
         "//submodules/Components/MultilineTextComponent",
         "//submodules/TelegramUI/Components/PlainButtonComponent",
+        "//submodules/TelegramUI/Components/VideoMessageCameraScreen",
+        "//submodules/TelegramUI/Components/MediaScrubberComponent",
     ] + select({
         "@build_bazel_rules_apple//apple:ios_arm64": appcenter_targets,
         "//build-system:ios_sim_arm64": [],
diff --git a/submodules/TelegramUI/Components/CameraScreen/Sources/CameraScreen.swift b/submodules/TelegramUI/Components/CameraScreen/Sources/CameraScreen.swift
index 83d72e2721..afdf8242fe 100644
--- a/submodules/TelegramUI/Components/CameraScreen/Sources/CameraScreen.swift
+++ b/submodules/TelegramUI/Components/CameraScreen/Sources/CameraScreen.swift
@@ -1607,7 +1607,6 @@ public class CameraScreen: ViewController {
                             if case .pendingImage = value {
                                 Queue.mainQueue().async {
                                     self.mainPreviewView.isEnabled = false
-                                    
                                     self.additionalPreviewView.isEnabled = false
                                 }
                             } else {
diff --git a/submodules/TelegramUI/Components/Chat/ChatMessageContactBubbleContentNode/Sources/ChatMessageContactBubbleContentNode.swift b/submodules/TelegramUI/Components/Chat/ChatMessageContactBubbleContentNode/Sources/ChatMessageContactBubbleContentNode.swift
index 6658b5895b..58649d5743 100644
--- a/submodules/TelegramUI/Components/Chat/ChatMessageContactBubbleContentNode/Sources/ChatMessageContactBubbleContentNode.swift
+++ b/submodules/TelegramUI/Components/Chat/ChatMessageContactBubbleContentNode/Sources/ChatMessageContactBubbleContentNode.swift
@@ -148,6 +148,9 @@ public class ChatMessageContactBubbleContentNode: ChatMessageBubbleContentNode {
             var textString: NSAttributedString?
             var updatedContactInfo: String?
             
+            var canMessage = false
+            var canAdd = false
+            
             var displayName: String = ""
             if let selectedContact = selectedContact {
                 if !selectedContact.firstName.isEmpty && !selectedContact.lastName.isEmpty {
@@ -161,6 +164,10 @@ public class ChatMessageContactBubbleContentNode: ChatMessageBubbleContentNode {
                     displayName = item.presentationData.strings.Message_Contact
                 }
                 
+                if selectedContact.peerId != nil {
+                    canMessage = true
+                }
+                
                 let info: String
                 if let previousContact = previousContact, previousContact.isEqual(to: selectedContact), let contactInfo = previousContactInfo {
                     info = contactInfo
@@ -199,6 +206,8 @@ public class ChatMessageContactBubbleContentNode: ChatMessageBubbleContentNode {
                     }
                 }
                 
+                canAdd = !item.associatedData.deviceContactsNumbers.contains(selectedContact.phoneNumber)
+                    
                 updatedContactInfo = info
                 
                 titleString = NSAttributedString(string: displayName, font: titleFont, textColor: mainColor)
@@ -305,10 +314,10 @@ public class ChatMessageContactBubbleContentNode: ChatMessageBubbleContentNode {
                 if let statusSuggestedWidthAndContinue = statusSuggestedWidthAndContinue {
                     maxContentWidth = max(maxContentWidth, statusSuggestedWidthAndContinue.0)
                 }
-                maxContentWidth = max(maxContentWidth, avatarSize.width + 7.0 + titleLayout.size.width)
-                maxContentWidth = max(maxContentWidth, avatarSize.width + 7.0 + textLayout.size.width)
+                maxContentWidth = max(maxContentWidth, 7.0 + avatarSize.width + 7.0 + titleLayout.size.width + 7.0)
+                maxContentWidth = max(maxContentWidth, 7.0 + avatarSize.width + 7.0 + textLayout.size.width + 7.0)
                 maxContentWidth = max(maxContentWidth, maxButtonWidth * 2.0)
-                maxContentWidth = max(maxContentWidth, 240.0)
+                maxContentWidth = max(maxContentWidth, 220.0)
                 
                 let contentWidth = maxContentWidth + layoutConstants.text.bubbleInsets.right * 2.0
                 
@@ -316,7 +325,19 @@ public class ChatMessageContactBubbleContentNode: ChatMessageBubbleContentNode {
                     let baseAvatarFrame = CGRect(origin: CGPoint(x: layoutConstants.text.bubbleInsets.right, y: layoutConstants.text.bubbleInsets.top), size: avatarSize)
                     
                     let lineWidth: CGFloat = 3.0
-                    let buttonWidth = floor((boundingWidth - layoutConstants.text.bubbleInsets.right * 2.0 - lineWidth) / 2.0)
+                    
+                    var buttonCount = 0
+                    if canMessage {
+                        buttonCount += 1
+                    }
+                    if canAdd {
+                        buttonCount += 1
+                    }
+                    var buttonWidth = floor((boundingWidth - layoutConstants.text.bubbleInsets.right * 2.0 - lineWidth))
+                    if buttonCount > 1 {
+                        buttonWidth /= CGFloat(buttonCount)
+                    }
+                    
                     let (messageButtonSize, messageButtonApply) = messageContinueLayout(buttonWidth, 33.0)
                     let (addButtonSize, addButtonApply) = addContinueLayout(buttonWidth, 33.0)
                   
@@ -329,7 +350,7 @@ public class ChatMessageContactBubbleContentNode: ChatMessageBubbleContentNode {
                         layoutSize.height += statusSizeAndApply.0.height - 4.0
                     }
                     let messageButtonFrame = CGRect(origin: CGPoint(x: layoutConstants.text.bubbleInsets.right + lineWidth, y: layoutSize.height - 24.0 - messageButtonSize.height), size: messageButtonSize)
-                    let addButtonFrame = CGRect(origin: CGPoint(x: layoutConstants.text.bubbleInsets.right + lineWidth + buttonWidth, y: layoutSize.height - 24.0 - addButtonSize.height), size: addButtonSize)
+                    let addButtonFrame = CGRect(origin: CGPoint(x: layoutConstants.text.bubbleInsets.right + lineWidth + (canMessage ? buttonWidth : 0.0), y: layoutSize.height - 24.0 - addButtonSize.height), size: addButtonSize)
                     let avatarFrame = baseAvatarFrame.offsetBy(dx: 9.0, dy: 14.0)
                     
                     var customLetters: [String] = []
@@ -362,9 +383,11 @@ public class ChatMessageContactBubbleContentNode: ChatMessageBubbleContentNode {
                             
                             strongSelf.titleNode.frame = CGRect(origin: CGPoint(x: avatarFrame.maxX + 7.0, y: avatarFrame.minY + 1.0), size: titleLayout.size)
                             strongSelf.textNode.frame = CGRect(origin: CGPoint(x: avatarFrame.maxX + 7.0, y: avatarFrame.minY + 20.0), size: textLayout.size)
-                            strongSelf.addButtonNode.frame = addButtonFrame
                             
+                            strongSelf.addButtonNode.frame = addButtonFrame
+                            strongSelf.addButtonNode.isHidden = !canAdd
                             strongSelf.messageButtonNode.frame = messageButtonFrame
+                            strongSelf.messageButtonNode.isHidden = !canMessage
                             
                             let backgroundInsets = layoutConstants.text.bubbleInsets
                             let backgroundFrame = CGRect(origin: CGPoint(x: backgroundInsets.left, y: backgroundInsets.top + 5.0), size: CGSize(width: contentWidth - layoutConstants.text.bubbleInsets.right * 2.0, height: layoutSize.height - 34.0))
diff --git a/submodules/TelegramUI/Components/ChatTextInputMediaRecordingButton/Sources/ChatTextInputMediaRecordingButton.swift b/submodules/TelegramUI/Components/ChatTextInputMediaRecordingButton/Sources/ChatTextInputMediaRecordingButton.swift
index 83337ed8d5..64e22d4b71 100644
--- a/submodules/TelegramUI/Components/ChatTextInputMediaRecordingButton/Sources/ChatTextInputMediaRecordingButton.swift
+++ b/submodules/TelegramUI/Components/ChatTextInputMediaRecordingButton/Sources/ChatTextInputMediaRecordingButton.swift
@@ -179,6 +179,7 @@ public final class ChatTextInputMediaRecordingButton: TGModernConversationInputM
     private let context: AccountContext
     private var theme: PresentationTheme
     private let useDarkTheme: Bool
+    private let pause: Bool
     private let strings: PresentationStrings
     
     public var mode: ChatTextInputMediaRecordingButtonMode = .audio
@@ -322,17 +323,18 @@ public final class ChatTextInputMediaRecordingButton: TGModernConversationInputM
         if let current = self.micLockValue {
             return current
         } else {
-            let lockView = LockView(frame: CGRect(origin: CGPoint(), size: CGSize(width: 40.0, height: 60.0)), theme: self.theme, useDarkTheme: self.useDarkTheme, strings: self.strings)
+            let lockView = LockView(frame: CGRect(origin: CGPoint(), size: CGSize(width: 40.0, height: 60.0)), theme: self.theme, useDarkTheme: self.useDarkTheme, pause: self.pause, strings: self.strings)
             lockView.addTarget(self, action: #selector(handleStopTap), for: .touchUpInside)
             self.micLockValue = lockView
             return lockView
         }
     }
     
-    public init(context: AccountContext, theme: PresentationTheme, useDarkTheme: Bool = false, strings: PresentationStrings, presentController: @escaping (ViewController) -> Void) {
+    public init(context: AccountContext, theme: PresentationTheme, useDarkTheme: Bool = false, pause: Bool = false, strings: PresentationStrings, presentController: @escaping (ViewController) -> Void) {
         self.context = context
         self.theme = theme
         self.useDarkTheme = useDarkTheme
+        self.pause = pause
         self.strings = strings
         self.animationView = ComponentView<Empty>()
         self.presentController = presentController
diff --git a/submodules/TelegramUI/Components/ChatTextInputMediaRecordingButton/Sources/LockView.swift b/submodules/TelegramUI/Components/ChatTextInputMediaRecordingButton/Sources/LockView.swift
index 31977edeb8..d2731acbe1 100644
--- a/submodules/TelegramUI/Components/ChatTextInputMediaRecordingButton/Sources/LockView.swift
+++ b/submodules/TelegramUI/Components/ChatTextInputMediaRecordingButton/Sources/LockView.swift
@@ -6,30 +6,33 @@ import TelegramPresentationData
 
 final class LockView: UIButton, TGModernConversationInputMicButtonLock {
     private let useDarkTheme: Bool
+    private let pause: Bool
     
-    private let idleView: AnimationView = {
-        guard let url = getAppBundle().url(forResource: "LockWait", withExtension: "json"), let animation = Animation.filepath(url.path)
-        else { return AnimationView() }
-        
-        let view = AnimationView(animation: animation, configuration: LottieConfiguration(renderingEngine: .mainThread, decodingStrategy: .codable))
-        view.loopMode = .autoReverse
-        view.backgroundColor = .clear
-        view.isOpaque = false
-        return view
-    }()
+    private let idleView: AnimationView
+    private let lockingView: AnimationView
     
-    private let lockingView: AnimationView = {
-        guard let url = getAppBundle().url(forResource: "LockPause", withExtension: "json"), let animation = Animation.filepath(url.path)
-        else { return AnimationView() }
-        
-        let view = AnimationView(animation: animation, configuration: LottieConfiguration(renderingEngine: .mainThread, decodingStrategy: .codable))
-        view.backgroundColor = .clear
-        view.isOpaque = false
-        return view
-    }()
-    
-    init(frame: CGRect, theme: PresentationTheme, useDarkTheme: Bool = false, strings: PresentationStrings) {
+    init(frame: CGRect, theme: PresentationTheme, useDarkTheme: Bool = false, pause: Bool = false, strings: PresentationStrings) {
         self.useDarkTheme = useDarkTheme
+        self.pause = pause
+        
+        if let url = getAppBundle().url(forResource: "LockWait", withExtension: "json"), let animation = Animation.filepath(url.path) {
+            let view = AnimationView(animation: animation, configuration: LottieConfiguration(renderingEngine: .mainThread, decodingStrategy: .codable))
+            view.loopMode = .autoReverse
+            view.backgroundColor = .clear
+            view.isOpaque = false
+            self.idleView = view
+        } else {
+            self.idleView = AnimationView()
+        }
+        
+        if let url = getAppBundle().url(forResource: self.pause ? "LockPause" : "Lock", withExtension: "json"), let animation = Animation.filepath(url.path) {
+            let view = AnimationView(animation: animation, configuration: LottieConfiguration(renderingEngine: .mainThread, decodingStrategy: .codable))
+            view.backgroundColor = .clear
+            view.isOpaque = false
+            self.lockingView = view
+        } else {
+            self.lockingView = AnimationView()
+        }
         
         super.init(frame: frame)
         
@@ -62,25 +65,33 @@ final class LockView: UIButton, TGModernConversationInputMicButtonLock {
     }
     
     func updateTheme(_ theme: PresentationTheme) {
-        [
-            "Rectangle.Заливка 1": theme.chat.inputPanel.panelBackgroundColor,
-            "Rectangle.Rectangle.Обводка 1": theme.chat.inputPanel.panelControlAccentColor,
-            "Rectangle 2.Rectangle.Обводка 1": theme.chat.inputPanel.panelControlAccentColor,
-            "Path.Path.Обводка 1": theme.chat.inputPanel.panelControlAccentColor,
-            "Path 4.Path 4.Обводка 1": theme.chat.inputPanel.panelControlAccentColor
-        ].forEach { key, value in
-            idleView.setValueProvider(ColorValueProvider(value.lottieColorValue), keypath: AnimationKeypath(keypath: "\(key).Color"))
+//        [
+//            "Rectangle.Заливка 1": theme.chat.inputPanel.panelBackgroundColor,
+//            "Rectangle.Rectangle.Обводка 1": theme.chat.inputPanel.panelControlAccentColor,
+//            "Rectangle 2.Rectangle.Обводка 1": theme.chat.inputPanel.panelControlAccentColor,
+//            "Path.Path.Обводка 1": theme.chat.inputPanel.panelControlAccentColor,
+//            "Path 4.Path 4.Обводка 1": theme.chat.inputPanel.panelControlAccentColor
+//        ].forEach { key, value in
+//            idleView.setValueProvider(ColorValueProvider(value.lottieColorValue), keypath: AnimationKeypath(keypath: "\(key).Color"))
+//        }
+//        
+        for keypath in idleView.allKeypaths(predicate: { $0.keys.last == "Color" }) {
+            idleView.setValueProvider(ColorValueProvider(theme.chat.inputPanel.panelControlAccentColor.lottieColorValue), keypath: AnimationKeypath(keypath: keypath))
         }
         
-        [
-            "Path.Path.Обводка 1": theme.chat.inputPanel.panelControlAccentColor,
-            "Path.Path.Заливка 1": theme.chat.inputPanel.panelBackgroundColor.withAlphaComponent(1.0),
-            "Rectangle.Rectangle.Обводка 1": theme.chat.inputPanel.panelControlAccentColor,
-            "Rectangle.Заливка 1": theme.chat.inputPanel.panelControlAccentColor,
-            "Path 4.Path 4.Обводка 1": theme.chat.inputPanel.panelControlAccentColor
-        ].forEach { key, value in
-            lockingView.setValueProvider(ColorValueProvider(value.lottieColorValue), keypath: AnimationKeypath(keypath: "\(key).Color"))
+        for keypath in lockingView.allKeypaths(predicate: { $0.keys.last == "Color" }) {
+            lockingView.setValueProvider(ColorValueProvider(theme.chat.inputPanel.panelControlAccentColor.lottieColorValue), keypath: AnimationKeypath(keypath: keypath))
         }
+//        
+//        [
+//            "Path.Path.Обводка 1": theme.chat.inputPanel.panelControlAccentColor,
+//            "Path.Path.Заливка 1": theme.chat.inputPanel.panelBackgroundColor.withAlphaComponent(1.0),
+//            "Rectangle.Rectangle.Обводка 1": theme.chat.inputPanel.panelControlAccentColor,
+//            "Rectangle.Заливка 1": theme.chat.inputPanel.panelControlAccentColor,
+//            "Path 4.Path 4.Обводка 1": theme.chat.inputPanel.panelControlAccentColor
+//        ].forEach { key, value in
+//            lockingView.setValueProvider(ColorValueProvider(value.lottieColorValue), keypath: AnimationKeypath(keypath: "\(key).Color"))
+//        }
     }
     
     override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
diff --git a/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditor.swift b/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditor.swift
index 899204a09e..b83e888f80 100644
--- a/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditor.swift
+++ b/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditor.swift
@@ -1736,7 +1736,7 @@ public final class MediaEditor {
     }
 }
 
-private func videoFrames(asset: AVAsset, count: Int, mirror: Bool = false) -> Signal<([UIImage], Double), NoError> {
+public func videoFrames(asset: AVAsset, count: Int, mirror: Bool = false) -> Signal<([UIImage], Double), NoError> {
     func blurredImage(_ image: UIImage) -> UIImage? {
         guard let image = image.cgImage else {
             return nil
diff --git a/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorValues.swift b/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorValues.swift
index 9d8676a5be..cbd042f975 100644
--- a/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorValues.swift
+++ b/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorValues.swift
@@ -136,7 +136,7 @@ public enum MediaQualityPreset: Int32 {
         case .compressedVeryHigh:
             return 1920.0
         case .videoMessage:
-            return 384.0
+            return 400.0
         case .profileLow:
             return 720.0
         case .profile, .profileHigh, .profileVeryHigh:
diff --git a/submodules/TelegramUI/Components/MediaEditorScreen/BUILD b/submodules/TelegramUI/Components/MediaEditorScreen/BUILD
index 144d6234e5..e0bf2ad253 100644
--- a/submodules/TelegramUI/Components/MediaEditorScreen/BUILD
+++ b/submodules/TelegramUI/Components/MediaEditorScreen/BUILD
@@ -49,6 +49,7 @@ swift_library(
         "//submodules/TelegramUI/Components/VolumeSliderContextItem",
         "//submodules/TelegramUI/Components/Stories/ForwardInfoPanelComponent",
         "//submodules/TelegramUI/Components/ContextReferenceButtonComponent",
+        "//submodules/TelegramUI/Components/MediaScrubberComponent",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift
index c8ed2ae305..ab48eb22a1 100644
--- a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift
+++ b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift
@@ -39,6 +39,7 @@ import VolumeSliderContextItem
 import TelegramStringFormatting
 import ForwardInfoPanelComponent
 import ContextReferenceButtonComponent
+import MediaScrubberComponent
 
 private let playbackButtonTag = GenericComponentViewTag()
 private let muteButtonTag = GenericComponentViewTag()
@@ -1359,6 +1360,7 @@ final class MediaEditorScreenComponent: Component {
                     transition: scrubberTransition,
                     component: AnyComponent(MediaScrubberComponent(
                         context: component.context,
+                        style: .editor,
                         generationTimestamp: playerState.generationTimestamp,
                         position: playerState.position,
                         minDuration: minDuration,
@@ -6081,3 +6083,23 @@ private func setupButtonShadow(_ view: UIView, radius: CGFloat = 2.0) {
     view.layer.shadowColor = UIColor.black.cgColor
     view.layer.shadowOpacity = 0.35
 }
+
+extension MediaScrubberComponent.Track {
+    public init(_ track: MediaEditorPlayerState.Track) {
+        let content: MediaScrubberComponent.Track.Content
+        switch track.content {
+        case let .video(frames, framesUpdateTimestamp):
+            content = .video(frames: frames, framesUpdateTimestamp: framesUpdateTimestamp)
+        case let .audio(artist, title, samples, peak):
+            content = .audio(artist: artist, title: title, samples: samples, peak: peak)
+        }
+        self.init(
+            id: track.id,
+            content: content,
+            duration: track.duration,
+            trimRange: track.trimRange,
+            offset: track.offset,
+            isMain: track.isMain
+        )
+    }
+}
diff --git a/submodules/TelegramUI/Components/MediaScrubberComponent/BUILD b/submodules/TelegramUI/Components/MediaScrubberComponent/BUILD
new file mode 100644
index 0000000000..06766ec3c3
--- /dev/null
+++ b/submodules/TelegramUI/Components/MediaScrubberComponent/BUILD
@@ -0,0 +1,25 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "MediaScrubberComponent",
+    module_name = "MediaScrubberComponent",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    copts = [
+        "-warnings-as-errors",
+    ],
+    deps = [
+        "//submodules/Display",
+        "//submodules/ComponentFlow",
+        "//submodules/TelegramPresentationData",
+        "//submodules/AccountContext",
+        "//submodules/Components/ComponentDisplayAdapters",
+        "//submodules/Components/MultilineTextComponent",
+        "//submodules/TelegramUI/Components/MediaEditor",
+        "//submodules/TelegramUI/Components/AudioWaveformComponent",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaScrubberComponent.swift b/submodules/TelegramUI/Components/MediaScrubberComponent/Sources/MediaScrubberComponent.swift
similarity index 88%
rename from submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaScrubberComponent.swift
rename to submodules/TelegramUI/Components/MediaScrubberComponent/Sources/MediaScrubberComponent.swift
index 9c4132866e..a8929b6c1f 100644
--- a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaScrubberComponent.swift
+++ b/submodules/TelegramUI/Components/MediaScrubberComponent/Sources/MediaScrubberComponent.swift
@@ -4,7 +4,6 @@ import Display
 import AsyncDisplayKit
 import ComponentFlow
 import SwiftSignalKit
-import ViewControllerComponent
 import ComponentDisplayAdapters
 import TelegramPresentationData
 import AccountContext
@@ -17,17 +16,16 @@ private let trackHeight: CGFloat = 39.0
 private let collapsedTrackHeight: CGFloat = 26.0
 private let trackSpacing: CGFloat = 4.0
 private let borderHeight: CGFloat = 1.0 + UIScreenPixel
-private let frameWidth: CGFloat = 24.0
 
-final class MediaScrubberComponent: Component {
-    typealias EnvironmentType = Empty
+public final class MediaScrubberComponent: Component {
+    public typealias EnvironmentType = Empty
     
-    struct Track: Equatable {
-        enum Content: Equatable {
+    public struct Track: Equatable {
+        public enum Content: Equatable {
             case video(frames: [UIImage], framesUpdateTimestamp: Double)
             case audio(artist: String?, title: String?, samples: Data?, peak: Int32)
             
-            static func ==(lhs: Content, rhs: Content) -> Bool {
+            public static func ==(lhs: Content, rhs: Content) -> Bool {
                 switch lhs {
                 case let .video(_, framesUpdateTimestamp):
                     if case .video(_, framesUpdateTimestamp) = rhs {
@@ -45,29 +43,38 @@ final class MediaScrubberComponent: Component {
             }
         }
         
-        let id: Int32
-        let content: Content
-        let duration: Double
-        let trimRange: Range<Double>?
-        let offset: Double?
-        let isMain: Bool
-        
-        init(_ track: MediaEditorPlayerState.Track) {
-            self.id = track.id
-            switch track.content {
-            case let .video(frames, framesUpdateTimestamp):
-                self.content = .video(frames: frames, framesUpdateTimestamp: framesUpdateTimestamp)
-            case let .audio(artist, title, samples, peak):
-                self.content = .audio(artist: artist, title: title, samples: samples, peak: peak)
-            }
-            self.duration = track.duration
-            self.trimRange = track.trimRange
-            self.offset = track.offset
-            self.isMain = track.isMain
+        public let id: Int32
+        public let content: Content
+        public let duration: Double
+        public let trimRange: Range<Double>?
+        public let offset: Double?
+        public let isMain: Bool
+                
+        public init(
+            id: Int32,
+            content: Content,
+            duration: Double,
+            trimRange: Range<Double>?,
+            offset: Double?,
+            isMain: Bool
+        ) {
+            self.id = id
+            self.content = content
+            self.duration = duration
+            self.trimRange = trimRange
+            self.offset = offset
+            self.isMain = isMain
         }
     }
     
+    public enum Style {
+        case editor
+        case videoMessage
+    }
+    
     let context: AccountContext
+    let style: Style
+    
     let generationTimestamp: Double
 
     let position: Double
@@ -77,13 +84,14 @@ final class MediaScrubberComponent: Component {
     
     let tracks: [Track]
     
-    let positionUpdated: (Double, Bool) -> Void    
+    let positionUpdated: (Double, Bool) -> Void
     let trackTrimUpdated: (Int32, Double, Double, Bool, Bool) -> Void
     let trackOffsetUpdated: (Int32, Double, Bool) -> Void
     let trackLongPressed: (Int32, UIView) -> Void
     
-    init(
+    public init(
         context: AccountContext,
+        style: Style,
         generationTimestamp: Double,
         position: Double,
         minDuration: Double,
@@ -96,6 +104,7 @@ final class MediaScrubberComponent: Component {
         trackLongPressed: @escaping (Int32, UIView) -> Void
     ) {
         self.context = context
+        self.style = style
         self.generationTimestamp = generationTimestamp
         self.position = position
         self.minDuration = minDuration
@@ -108,7 +117,7 @@ final class MediaScrubberComponent: Component {
         self.trackLongPressed = trackLongPressed
     }
     
-    static func ==(lhs: MediaScrubberComponent, rhs: MediaScrubberComponent) -> Bool {
+    public static func ==(lhs: MediaScrubberComponent, rhs: MediaScrubberComponent) -> Bool {
         if lhs.context !== rhs.context {
             return false
         }
@@ -133,7 +142,7 @@ final class MediaScrubberComponent: Component {
         return true
     }
     
-    final class View: UIView, UIGestureRecognizerDelegate {
+    public final class View: UIView, UIGestureRecognizerDelegate {
         private var trackViews: [Int32: TrackView] = [:]
         private let trimView: TrimView
         private let ghostTrimView: TrimView
@@ -260,7 +269,7 @@ final class MediaScrubberComponent: Component {
             guard let component = self.component, let firstTrack = component.tracks.first else {
                 return 0.0
             }
-            return firstTrack.trimRange?.upperBound ?? min(firstTrack.duration, storyMaxVideoDuration)
+            return firstTrack.trimRange?.upperBound ?? min(firstTrack.duration, component.maxDuration)
         }
         
         private var mainAudioTrackOffset: Double? {
@@ -364,11 +373,18 @@ final class MediaScrubberComponent: Component {
             self.cursorView.frame = cursorFrame(size: scrubberSize, height: self.effectiveCursorHeight, position: updatedPosition, duration: self.trimDuration)
         }
                 
-        func update(component: MediaScrubberComponent, availableSize: CGSize, state: EmptyComponentState, environment: Environment<EnvironmentType>, transition: Transition) -> CGSize {
+        public func update(component: MediaScrubberComponent, availableSize: CGSize, state: EmptyComponentState, environment: Environment<EnvironmentType>, transition: Transition) -> CGSize {
             let isFirstTime = self.component == nil
             self.component = component
             self.state = state
             
+            switch component.style {
+            case .editor:
+                self.cursorView.isHidden = false
+            case .videoMessage:
+                self.cursorView.isHidden = true
+            }
+            
             var totalHeight: CGFloat = 0.0
             var trackLayout: [Int32: (CGRect, Transition, Bool)] = [:]
             
@@ -427,6 +443,7 @@ final class MediaScrubberComponent: Component {
                 
                 let trackSize = trackView.update(
                     context: component.context,
+                    style: component.style,
                     track: track,
                     isSelected: id == self.selectedTrackId,
                     availableSize: availableSize,
@@ -495,12 +512,20 @@ final class MediaScrubberComponent: Component {
                 }
             }
 
-            let scrubberSize = CGSize(width: availableSize.width, height: trackHeight)
+            let fullTrackHeight: CGFloat
+            switch component.style {
+            case .editor:
+                fullTrackHeight = trackHeight
+            case .videoMessage:
+                fullTrackHeight = 33.0
+            }
+            let scrubberSize = CGSize(width: availableSize.width, height: fullTrackHeight)
             
             self.trimView.isHollow = self.selectedTrackId != lowestVideoId || self.isAudioOnly
             let (leftHandleFrame, rightHandleFrame) = self.trimView.update(
+                style: component.style,
                 visualInsets: trimViewVisualInsets,
-                scrubberSize: CGSize(width: trackViewWidth, height: trackHeight),
+                scrubberSize: CGSize(width: trackViewWidth, height: fullTrackHeight),
                 duration: mainTrimDuration,
                 startPosition: startPosition,
                 endPosition: endPosition,
@@ -511,6 +536,7 @@ final class MediaScrubberComponent: Component {
             )
             
             let (ghostLeftHandleFrame, ghostRightHandleFrame) = self.ghostTrimView.update(
+                style: component.style,
                 visualInsets: .zero,
                 scrubberSize: CGSize(width: scrubberSize.width, height: collapsedTrackHeight),
                 duration: self.duration,
@@ -591,7 +617,7 @@ final class MediaScrubberComponent: Component {
             return CGSize(width: availableSize.width, height: totalHeight)
         }
         
-        override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
+        public override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
             let hitTestSlop = UIEdgeInsets(top: -8.0, left: -9.0, bottom: -8.0, right: -9.0)
             return self.bounds.inset(by: hitTestSlop).contains(point)
         }
@@ -683,11 +709,9 @@ private class TrackView: UIView, UIScrollViewDelegate, UIGestureRecognizerDelega
         
         self.videoTransparentFramesContainer.alpha = 0.5
         self.videoTransparentFramesContainer.clipsToBounds = true
-        self.videoTransparentFramesContainer.layer.cornerRadius = 9.0
         self.videoTransparentFramesContainer.isUserInteractionEnabled = false
         
         self.videoOpaqueFramesContainer.clipsToBounds = true
-        self.videoOpaqueFramesContainer.layer.cornerRadius = 9.0
         self.videoOpaqueFramesContainer.isUserInteractionEnabled = false
         
         self.addSubview(self.clippingView)
@@ -760,6 +784,7 @@ private class TrackView: UIView, UIScrollViewDelegate, UIGestureRecognizerDelega
     
     func update(
         context: AccountContext,
+        style: MediaScrubberComponent.Style,
         track: MediaScrubberComponent.Track,
         isSelected: Bool,
         availableSize: CGSize,
@@ -769,7 +794,20 @@ private class TrackView: UIView, UIScrollViewDelegate, UIGestureRecognizerDelega
         let previousParams = self.params
         self.params = (track, isSelected, duration)
         
-        let scrubberSize = CGSize(width: availableSize.width, height: isSelected ? trackHeight : collapsedTrackHeight)
+        let fullTrackHeight: CGFloat
+        let framesCornerRadius: CGFloat
+        switch style {
+        case .editor:
+            fullTrackHeight = trackHeight
+            framesCornerRadius = 9.0
+        case .videoMessage:
+            fullTrackHeight = 33.0
+            framesCornerRadius = fullTrackHeight / 2.0
+        }
+        self.videoTransparentFramesContainer.layer.cornerRadius = framesCornerRadius
+        self.videoOpaqueFramesContainer.layer.cornerRadius = framesCornerRadius
+        
+        let scrubberSize = CGSize(width: availableSize.width, height: isSelected ? fullTrackHeight : collapsedTrackHeight)
         
         var screenSpanDuration = duration
         if track.isAudio && track.isMain {
@@ -891,11 +929,18 @@ private class TrackView: UIView, UIScrollViewDelegate, UIGestureRecognizerDelega
                         transparentFrameLayer = VideoFrameLayer()
                         transparentFrameLayer.masksToBounds = true
                         transparentFrameLayer.contentsGravity = .resizeAspectFill
+                        if case .videoMessage = style {
+                            transparentFrameLayer.contentsRect = CGRect(origin: .zero, size: CGSize(width: 1.0, height: 1.0)).insetBy(dx: 0.15, dy: 0.15)
+                        }
                         self.videoTransparentFramesContainer.layer.addSublayer(transparentFrameLayer)
                         self.videoTransparentFrameLayers.append(transparentFrameLayer)
+                        
                         opaqueFrameLayer = VideoFrameLayer()
                         opaqueFrameLayer.masksToBounds = true
                         opaqueFrameLayer.contentsGravity = .resizeAspectFill
+                        if case .videoMessage = style {
+                            opaqueFrameLayer.contentsRect = CGRect(origin: .zero, size: CGSize(width: 1.0, height: 1.0)).insetBy(dx: 0.15, dy: 0.15)
+                        }
                         self.videoOpaqueFramesContainer.layer.addSublayer(opaqueFrameLayer)
                         self.videoOpaqueFrameLayers.append(opaqueFrameLayer)
                     } else {
@@ -927,7 +972,7 @@ private class TrackView: UIView, UIScrollViewDelegate, UIGestureRecognizerDelega
             if let image = frames.first, image.size.height > 0.0 {
                 frameAspectRatio = max(0.66, image.size.width / image.size.height)
             }
-            let frameSize = CGSize(width: trackHeight * frameAspectRatio, height: trackHeight)
+            let frameSize = CGSize(width: fullTrackHeight * frameAspectRatio, height: fullTrackHeight)
             var frameOffset: CGFloat = 0.0
             for i in 0 ..< frames.count {
                 if i < self.videoTransparentFrameLayers.count {
@@ -1052,7 +1097,7 @@ private class TrackView: UIView, UIScrollViewDelegate, UIGestureRecognizerDelega
                     )
                 ),
                 environment: {},
-                containerSize: CGSize(width: containerFrame.width, height: trackHeight)
+                containerSize: CGSize(width: containerFrame.width, height: fullTrackHeight)
             )
             if let view = self.audioWaveform.view as? AudioWaveformComponent.View {
                 if view.superview == nil {
@@ -1090,54 +1135,29 @@ private class TrimView: UIView {
     override init(frame: CGRect) {
         super.init(frame: .zero)
         
-        let height = trackHeight
-        let handleImage = generateImage(CGSize(width: handleWidth, height: height), rotatedContext: { size, context in
-            context.clear(CGRect(origin: .zero, size: size))
-            context.setFillColor(UIColor.white.cgColor)
-            
-            let path = UIBezierPath(roundedRect: CGRect(origin: .zero, size: CGSize(width: size.width * 2.0, height: size.height)), cornerRadius: 9.0)
-            context.addPath(path.cgPath)
-            context.fillPath()
-            
-            context.setBlendMode(.clear)
-            let innerPath = UIBezierPath(roundedRect: CGRect(origin: CGPoint(x: handleWidth - 3.0, y: borderHeight), size: CGSize(width: handleWidth, height: size.height - borderHeight * 2.0)), cornerRadius: 2.0)
-            context.addPath(innerPath.cgPath)
-            context.fillPath()
-        })?.withRenderingMode(.alwaysTemplate).resizableImage(withCapInsets: UIEdgeInsets(top: 10.0, left: 0.0, bottom: 10.0, right: 0.0))
-        
         self.zoneView.image = UIImage()
         self.zoneView.isUserInteractionEnabled = true
         self.zoneView.hitTestSlop = UIEdgeInsets(top: -8.0, left: 0.0, bottom: -8.0, right: 0.0)
         
-        self.leftHandleView.image = handleImage
         self.leftHandleView.isUserInteractionEnabled = true
         self.leftHandleView.tintColor = .white
         self.leftHandleView.contentMode = .scaleToFill
         self.leftHandleView.hitTestSlop = UIEdgeInsets(top: -8.0, left: -9.0, bottom: -8.0, right: -9.0)
         
-        self.rightHandleView.image = handleImage
         self.rightHandleView.transform = CGAffineTransform(scaleX: -1.0, y: 1.0)
         self.rightHandleView.isUserInteractionEnabled = true
         self.rightHandleView.tintColor = .white
         self.rightHandleView.contentMode = .scaleToFill
         self.rightHandleView.hitTestSlop = UIEdgeInsets(top: -8.0, left: -9.0, bottom: -8.0, right: -9.0)
         
-        self.borderView.image = generateImage(CGSize(width: 1.0, height: height), rotatedContext: { size, context in
-            context.clear(CGRect(origin: .zero, size: size))
-            context.setFillColor(UIColor.white.cgColor)
-            context.fill(CGRect(origin: .zero, size: CGSize(width: size.width, height: borderHeight)))
-            context.fill(CGRect(origin: CGPoint(x: 0.0, y: size.height - borderHeight), size: CGSize(width: size.width, height: height)))
-        })?.withRenderingMode(.alwaysTemplate).resizableImage(withCapInsets: UIEdgeInsets(top: 10.0, left: 0.0, bottom: 10.0, right: 0.0))
         self.borderView.tintColor = .white
         self.borderView.isUserInteractionEnabled = false
         
         self.leftCapsuleView.clipsToBounds = true
         self.leftCapsuleView.layer.cornerRadius = 1.0
-        self.leftCapsuleView.backgroundColor = UIColor(rgb: 0x343436)
         
         self.rightCapsuleView.clipsToBounds = true
         self.rightCapsuleView.layer.cornerRadius = 1.0
-        self.rightCapsuleView.backgroundColor = UIColor(rgb: 0x343436)
         
         self.addSubview(self.zoneView)
         self.addSubview(self.leftHandleView)
@@ -1279,6 +1299,7 @@ private class TrimView: UIView {
     )?
     
     func update(
+        style: MediaScrubberComponent.Style,
         visualInsets: UIEdgeInsets,
         scrubberSize: CGSize,
         duration: Double,
@@ -1288,34 +1309,101 @@ private class TrimView: UIView {
         minDuration: Double,
         maxDuration: Double,
         transition: Transition
-    ) -> (leftHandleFrame: CGRect, rightHandleFrame: CGRect)
-    {
+    ) -> (leftHandleFrame: CGRect, rightHandleFrame: CGRect) {
+        let isFirstTime = self.params == nil
         self.params = (scrubberSize, duration, startPosition, endPosition, position, minDuration, maxDuration)
         
-        let trimColor = self.isPanningTrimHandle ? UIColor(rgb: 0xf8d74a) : .white
+        let effectiveHandleWidth: CGFloat
+        let fullTrackHeight: CGFloat
+        let capsuleOffset: CGFloat
+        let color: UIColor
+        let highlightColor: UIColor
+        
+        switch style {
+        case .editor:
+            effectiveHandleWidth = handleWidth
+            fullTrackHeight = trackHeight
+            capsuleOffset = 5.0 - UIScreenPixel
+            color = .white
+            highlightColor = UIColor(rgb: 0xf8d74a)
+            
+            if isFirstTime {
+                self.borderView.image = generateImage(CGSize(width: 1.0, height: fullTrackHeight), rotatedContext: { size, context in
+                    context.clear(CGRect(origin: .zero, size: size))
+                    context.setFillColor(UIColor.white.cgColor)
+                    context.fill(CGRect(origin: .zero, size: CGSize(width: size.width, height: borderHeight)))
+                    context.fill(CGRect(origin: CGPoint(x: 0.0, y: size.height - borderHeight), size: CGSize(width: size.width, height: fullTrackHeight)))
+                })?.withRenderingMode(.alwaysTemplate).resizableImage(withCapInsets: UIEdgeInsets(top: 10.0, left: 0.0, bottom: 10.0, right: 0.0))
+                
+                let handleImage = generateImage(CGSize(width: handleWidth, height: fullTrackHeight), rotatedContext: { size, context in
+                    context.clear(CGRect(origin: .zero, size: size))
+                    context.setFillColor(UIColor.white.cgColor)
+                    
+                    let path = UIBezierPath(roundedRect: CGRect(origin: .zero, size: CGSize(width: size.width * 2.0, height: size.height)), cornerRadius: 9.0)
+                    context.addPath(path.cgPath)
+                    context.fillPath()
+                    
+                    context.setBlendMode(.clear)
+                    let innerPath = UIBezierPath(roundedRect: CGRect(origin: CGPoint(x: handleWidth - 3.0, y: borderHeight), size: CGSize(width: handleWidth, height: size.height - borderHeight * 2.0)), cornerRadius: 2.0)
+                    context.addPath(innerPath.cgPath)
+                    context.fillPath()
+                })?.withRenderingMode(.alwaysTemplate).resizableImage(withCapInsets: UIEdgeInsets(top: 10.0, left: 0.0, bottom: 10.0, right: 0.0))
+                
+                self.leftHandleView.image = handleImage
+                self.rightHandleView.image = handleImage
+                
+                self.leftCapsuleView.backgroundColor = UIColor(rgb: 0x343436)
+                self.rightCapsuleView.backgroundColor = UIColor(rgb: 0x343436)
+            }
+        case .videoMessage:
+            effectiveHandleWidth = 16.0
+            fullTrackHeight = 33.0
+            capsuleOffset = 8.0
+            color = UIColor(rgb: 0x3478f6)
+            highlightColor = UIColor(rgb: 0x3478f6)
+            
+            if isFirstTime {
+                let handleImage = generateImage(CGSize(width: effectiveHandleWidth, height: fullTrackHeight), rotatedContext: { size, context in
+                    context.clear(CGRect(origin: .zero, size: size))
+                    context.setFillColor(UIColor.white.cgColor)
+                    
+                    let path = UIBezierPath(roundedRect: CGRect(origin: .zero, size: CGSize(width: size.width * 2.0, height: size.height)), cornerRadius: 16.5)
+                    context.addPath(path.cgPath)
+                    context.fillPath()
+                })?.withRenderingMode(.alwaysTemplate)
+                
+                self.leftHandleView.image = handleImage
+                self.rightHandleView.image = handleImage
+                
+                self.leftCapsuleView.backgroundColor = .white
+                self.rightCapsuleView.backgroundColor = .white
+            }
+        }
+        
+        let trimColor = self.isPanningTrimHandle ? highlightColor : color
         transition.setTintColor(view: self.leftHandleView, color: trimColor)
         transition.setTintColor(view: self.rightHandleView, color: trimColor)
         transition.setTintColor(view: self.borderView, color: trimColor)
         
         let totalWidth = scrubberSize.width
-        let totalRange = totalWidth - handleWidth
+        let totalRange = totalWidth - effectiveHandleWidth
         let leftHandlePositionFraction = duration > 0.0 ? startPosition / duration : 0.0
-        let leftHandlePosition = floorToScreenPixels(handleWidth / 2.0 + totalRange * leftHandlePositionFraction)
+        let leftHandlePosition = floorToScreenPixels(effectiveHandleWidth / 2.0 + totalRange * leftHandlePositionFraction)
         
-        var leftHandleFrame = CGRect(origin: CGPoint(x: leftHandlePosition - handleWidth / 2.0, y: 0.0), size: CGSize(width: handleWidth, height: scrubberSize.height))
+        var leftHandleFrame = CGRect(origin: CGPoint(x: leftHandlePosition - effectiveHandleWidth / 2.0, y: 0.0), size: CGSize(width: effectiveHandleWidth, height: scrubberSize.height))
         leftHandleFrame.origin.x = max(leftHandleFrame.origin.x, visualInsets.left)
         transition.setFrame(view: self.leftHandleView, frame: leftHandleFrame)
 
         let rightHandlePositionFraction = duration > 0.0 ? endPosition / duration : 1.0
-        let rightHandlePosition = floorToScreenPixels(handleWidth / 2.0 + totalRange * rightHandlePositionFraction)
+        let rightHandlePosition = floorToScreenPixels(effectiveHandleWidth / 2.0 + totalRange * rightHandlePositionFraction)
         
-        var rightHandleFrame = CGRect(origin: CGPoint(x: max(leftHandleFrame.maxX, rightHandlePosition - handleWidth / 2.0), y: 0.0), size: CGSize(width: handleWidth, height: scrubberSize.height))
-        rightHandleFrame.origin.x = min(rightHandleFrame.origin.x, totalWidth - visualInsets.right - handleWidth)
+        var rightHandleFrame = CGRect(origin: CGPoint(x: max(leftHandleFrame.maxX, rightHandlePosition - effectiveHandleWidth / 2.0), y: 0.0), size: CGSize(width: effectiveHandleWidth, height: scrubberSize.height))
+        rightHandleFrame.origin.x = min(rightHandleFrame.origin.x, totalWidth - visualInsets.right - effectiveHandleWidth)
         transition.setFrame(view: self.rightHandleView, frame: rightHandleFrame)
         
         let capsuleSize = CGSize(width: 2.0, height: 11.0)
-        transition.setFrame(view: self.leftCapsuleView, frame: CGRect(origin: CGPoint(x: 5.0 - UIScreenPixel, y: floorToScreenPixels((leftHandleFrame.height - capsuleSize.height) / 2.0)), size: capsuleSize))
-        transition.setFrame(view: self.rightCapsuleView, frame: CGRect(origin: CGPoint(x: 5.0 - UIScreenPixel, y: floorToScreenPixels((leftHandleFrame.height - capsuleSize.height) / 2.0)), size: capsuleSize))
+        transition.setFrame(view: self.leftCapsuleView, frame: CGRect(origin: CGPoint(x: capsuleOffset, y: floorToScreenPixels((leftHandleFrame.height - capsuleSize.height) / 2.0)), size: capsuleSize))
+        transition.setFrame(view: self.rightCapsuleView, frame: CGRect(origin: CGPoint(x: capsuleOffset, y: floorToScreenPixels((leftHandleFrame.height - capsuleSize.height) / 2.0)), size: capsuleSize))
         
         let zoneFrame = CGRect(x: leftHandleFrame.maxX, y: 0.0, width: rightHandleFrame.minX - leftHandleFrame.maxX, height: scrubberSize.height)
         transition.setFrame(view: self.zoneView, frame: zoneFrame)
@@ -1345,7 +1433,7 @@ private class VideoFrameLayer: SimpleShapeLayer {
     
     override func layoutSublayers() {
         super.layoutSublayers()
-        
+                
         if self.stripeLayer.superlayer == nil {
             self.stripeLayer.backgroundColor = UIColor(rgb: 0x000000, alpha: 0.3).cgColor
             self.addSublayer(self.stripeLayer)
diff --git a/submodules/TelegramUI/Components/MessageInputActionButtonComponent/Sources/MessageInputActionButtonComponent.swift b/submodules/TelegramUI/Components/MessageInputActionButtonComponent/Sources/MessageInputActionButtonComponent.swift
index 962f2aca1c..874c3d3d1e 100644
--- a/submodules/TelegramUI/Components/MessageInputActionButtonComponent/Sources/MessageInputActionButtonComponent.swift
+++ b/submodules/TelegramUI/Components/MessageInputActionButtonComponent/Sources/MessageInputActionButtonComponent.swift
@@ -333,6 +333,7 @@ public final class MessageInputActionButtonComponent: Component {
                         context: component.context,
                         theme: defaultDarkPresentationTheme,
                         useDarkTheme: true,
+                        pause: false,
                         strings: component.strings,
                         presentController: component.presentController
                     )
diff --git a/submodules/TelegramUI/Components/MessageInputPanelComponent/Sources/MediaPreviewPanelComponent.swift b/submodules/TelegramUI/Components/MessageInputPanelComponent/Sources/MediaPreviewPanelComponent.swift
index 69f49b4767..f31ebd0b05 100644
--- a/submodules/TelegramUI/Components/MessageInputPanelComponent/Sources/MediaPreviewPanelComponent.swift
+++ b/submodules/TelegramUI/Components/MessageInputPanelComponent/Sources/MediaPreviewPanelComponent.swift
@@ -104,7 +104,7 @@ public final class MediaPreviewPanelComponent: Component {
         if lhs.strings !== rhs.strings {
             return false
         }
-        if lhs.mediaPreview !== rhs.mediaPreview {
+        if lhs.mediaPreview != rhs.mediaPreview {
             return false
         }
         if lhs.insets != rhs.insets {
@@ -199,7 +199,7 @@ public final class MediaPreviewPanelComponent: Component {
         }
         
         @objc private func playPauseButtonPressed() {
-            guard let component = self.component else {
+            guard let component = self.component, case let .audio(audio) = component.mediaPreview else {
                 return
             }
             
@@ -212,7 +212,7 @@ public final class MediaPreviewPanelComponent: Component {
                     postbox: component.context.account.postbox,
                     userLocation: .other,
                     userContentType: .audio,
-                    resourceReference: .standalone(resource: component.mediaPreview.resource),
+                    resourceReference: .standalone(resource: audio.resource),
                     streamable: .none,
                     video: false,
                     preferSoftwareDecoding: false,
@@ -231,8 +231,8 @@ public final class MediaPreviewPanelComponent: Component {
         }
         
         func update(component: MediaPreviewPanelComponent, availableSize: CGSize, state: EmptyComponentState, environment: Environment<Empty>, transition: Transition) -> CGSize {
-            if self.component == nil {
-                self.timerTextValue = textForDuration(seconds: component.mediaPreview.duration)
+            if self.component == nil, case let .audio(audio) = component.mediaPreview {
+                self.timerTextValue = textForDuration(seconds: audio.duration)
             }
             
             self.component = component
@@ -263,69 +263,71 @@ public final class MediaPreviewPanelComponent: Component {
             
             let waveformFrame = CGRect(origin: CGPoint(x: component.insets.left + 47.0, y: component.insets.top + floor((availableSize.height - component.insets.top - component.insets.bottom - 24.0) * 0.5)), size: CGSize(width: availableSize.width - component.insets.right - 47.0 - (component.insets.left + 47.0), height: 24.0))
             
-            let _ = self.waveform.update(
-                transition: transition,
-                component: AnyComponent(AudioWaveformComponent(
-                    backgroundColor: UIColor.white.withAlphaComponent(0.1),
-                    foregroundColor: UIColor.white.withAlphaComponent(1.0),
-                    shimmerColor: nil,
-                    style: .middle,
-                    samples: component.mediaPreview.waveform.samples,
-                    peak: component.mediaPreview.waveform.peak,
-                    status: self.mediaPlayerStatus.get() |> map { value -> MediaPlayerStatus in
-                        if let value {
-                            return value
-                        } else {
-                            return MediaPlayerStatus(
-                                generationTimestamp: 0.0,
-                                duration: 0.0,
-                                dimensions: CGSize(),
-                                timestamp: 0.0,
-                                baseRate: 1.0,
-                                seekId: 0,
-                                status: .paused,
-                                soundEnabled: true
-                            )
+            if case let .audio(audio) = component.mediaPreview {
+                let _ = self.waveform.update(
+                    transition: transition,
+                    component: AnyComponent(AudioWaveformComponent(
+                        backgroundColor: UIColor.white.withAlphaComponent(0.1),
+                        foregroundColor: UIColor.white.withAlphaComponent(1.0),
+                        shimmerColor: nil,
+                        style: .middle,
+                        samples: audio.waveform.samples,
+                        peak: audio.waveform.peak,
+                        status: self.mediaPlayerStatus.get() |> map { value -> MediaPlayerStatus in
+                            if let value {
+                                return value
+                            } else {
+                                return MediaPlayerStatus(
+                                    generationTimestamp: 0.0,
+                                    duration: 0.0,
+                                    dimensions: CGSize(),
+                                    timestamp: 0.0,
+                                    baseRate: 1.0,
+                                    seekId: 0,
+                                    status: .paused,
+                                    soundEnabled: true
+                                )
+                            }
+                        },
+                        isViewOnceMessage: false,
+                        seek: { [weak self] timestamp in
+                            guard let self, let mediaPlayer = self.mediaPlayer else {
+                                return
+                            }
+                            mediaPlayer.seek(timestamp: timestamp)
+                        },
+                        updateIsSeeking: { [weak self] isSeeking in
+                            guard let self, let mediaPlayer = self.mediaPlayer else {
+                                return
+                            }
+                            if isSeeking {
+                                mediaPlayer.pause()
+                            } else {
+                                mediaPlayer.play()
+                            }
                         }
-                    },
-                    isViewOnceMessage: false,
-                    seek: { [weak self] timestamp in
-                        guard let self, let mediaPlayer = self.mediaPlayer else {
-                            return
-                        }
-                        mediaPlayer.seek(timestamp: timestamp)
-                    },
-                    updateIsSeeking: { [weak self] isSeeking in
-                        guard let self, let mediaPlayer = self.mediaPlayer else {
-                            return
-                        }
-                        if isSeeking {
-                            mediaPlayer.pause()
-                        } else {
-                            mediaPlayer.play()
-                        }
-                    }
-                )),
-                environment: {},
-                containerSize: waveformFrame.size
-            )
-            let _ = self.vibrancyWaveform.update(
-                transition: transition,
-                component: AnyComponent(AudioWaveformComponent(
-                    backgroundColor: .white,
-                    foregroundColor: .white,
-                    shimmerColor: nil,
-                    style: .middle,
-                    samples: component.mediaPreview.waveform.samples,
-                    peak: component.mediaPreview.waveform.peak,
-                    status: .complete(),
-                    isViewOnceMessage: false,
-                    seek: nil,
-                    updateIsSeeking: nil
-                )),
-                environment: {},
-                containerSize: waveformFrame.size
-            )
+                    )),
+                    environment: {},
+                    containerSize: waveformFrame.size
+                )
+                let _ = self.vibrancyWaveform.update(
+                    transition: transition,
+                    component: AnyComponent(AudioWaveformComponent(
+                        backgroundColor: .white,
+                        foregroundColor: .white,
+                        shimmerColor: nil,
+                        style: .middle,
+                        samples: audio.waveform.samples,
+                        peak: audio.waveform.peak,
+                        status: .complete(),
+                        isViewOnceMessage: false,
+                        seek: nil,
+                        updateIsSeeking: nil
+                    )),
+                    environment: {},
+                    containerSize: waveformFrame.size
+                )
+            }
             
             if let waveformView = self.waveform.view as? AudioWaveformComponent.View {
                 if waveformView.superview == nil {
diff --git a/submodules/TelegramUI/Components/MessageInputPanelComponent/Sources/MessageInputPanelComponent.swift b/submodules/TelegramUI/Components/MessageInputPanelComponent/Sources/MessageInputPanelComponent.swift
index 19a8992f9a..924844df9b 100644
--- a/submodules/TelegramUI/Components/MessageInputPanelComponent/Sources/MessageInputPanelComponent.swift
+++ b/submodules/TelegramUI/Components/MessageInputPanelComponent/Sources/MessageInputPanelComponent.swift
@@ -313,7 +313,7 @@ public final class MessageInputPanelComponent: Component {
         if lhs.wasRecordingDismissed != rhs.wasRecordingDismissed {
             return false
         }
-        if lhs.recordedAudioPreview !== rhs.recordedAudioPreview {
+        if lhs.recordedAudioPreview != rhs.recordedAudioPreview {
             return false
         }
         if lhs.hasRecordedVideoPreview != rhs.hasRecordedVideoPreview {
diff --git a/submodules/TelegramUI/Components/PlainButtonComponent/Sources/PlainButtonComponent.swift b/submodules/TelegramUI/Components/PlainButtonComponent/Sources/PlainButtonComponent.swift
index 1152c2cefd..bb386fa85d 100644
--- a/submodules/TelegramUI/Components/PlainButtonComponent/Sources/PlainButtonComponent.swift
+++ b/submodules/TelegramUI/Components/PlainButtonComponent/Sources/PlainButtonComponent.swift
@@ -16,6 +16,8 @@ public final class PlainButtonComponent: Component {
     public let contentInsets: UIEdgeInsets
     public let action: () -> Void
     public let isEnabled: Bool
+    public let animateAlpha: Bool
+    public let tag: AnyObject?
     
     public init(
         content: AnyComponent<Empty>,
@@ -23,7 +25,9 @@ public final class PlainButtonComponent: Component {
         minSize: CGSize? = nil,
         contentInsets: UIEdgeInsets = UIEdgeInsets(),
         action: @escaping () -> Void,
-        isEnabled: Bool = true
+        isEnabled: Bool = true,
+        animateAlpha: Bool = true,
+        tag : AnyObject? = nil
     ) {
         self.content = content
         self.effectAlignment = effectAlignment
@@ -31,8 +35,10 @@ public final class PlainButtonComponent: Component {
         self.contentInsets = contentInsets
         self.action = action
         self.isEnabled = isEnabled
+        self.animateAlpha = animateAlpha
+        self.tag = tag
     }
-
+    
     public static func ==(lhs: PlainButtonComponent, rhs: PlainButtonComponent) -> Bool {
         if lhs.content != rhs.content {
             return false
@@ -49,10 +55,26 @@ public final class PlainButtonComponent: Component {
         if lhs.isEnabled != rhs.isEnabled {
             return false
         }
+        if lhs.animateAlpha != rhs.animateAlpha {
+            return false
+        }
+        if lhs.tag !== rhs.tag {
+            return false
+        }
         return true
     }
 
-    public final class View: HighlightTrackingButton {
+    public final class View: HighlightTrackingButton, ComponentTaggedView {
+        public func matches(tag: Any) -> Bool {
+            if let component = self.component, let componentTag = component.tag {
+                let tag = tag as AnyObject
+                if componentTag === tag {
+                    return true
+                }
+            }
+            return false
+        }
+        
         private var component: PlainButtonComponent?
         private weak var componentState: EmptyComponentState?
 
@@ -73,18 +95,25 @@ public final class PlainButtonComponent: Component {
             
             self.highligthedChanged = { [weak self] highlighted in
                 if let self, self.bounds.width > 0.0 {
+                    let animateAlpha = self.component?.animateAlpha ?? true
+                    
                     let topScale: CGFloat = (self.bounds.width - 8.0) / self.bounds.width
                     let maxScale: CGFloat = (self.bounds.width + 2.0) / self.bounds.width
                     
                     if highlighted {
                         self.contentContainer.layer.removeAnimation(forKey: "opacity")
                         self.contentContainer.layer.removeAnimation(forKey: "sublayerTransform")
-                        self.contentContainer.alpha = 0.7
+                        
+                        if animateAlpha {
+                            self.contentContainer.alpha = 0.7
+                        }
                         let transition = Transition(animation: .curve(duration: 0.2, curve: .easeInOut))
                         transition.setScale(layer: self.contentContainer.layer, scale: topScale)
                     } else {
-                        self.contentContainer.alpha = 1.0
-                        self.contentContainer.layer.animateAlpha(from: 0.7, to: 1.0, duration: 0.2)
+                        if animateAlpha {
+                            self.contentContainer.alpha = 1.0
+                            self.contentContainer.layer.animateAlpha(from: 0.7, to: 1.0, duration: 0.2)
+                        }
                         
                         let transition = Transition(animation: .none)
                         transition.setScale(layer: self.contentContainer.layer, scale: 1.0)
diff --git a/submodules/TelegramUI/Components/Resources/FetchVideoMediaResource/Sources/FetchVideoMediaResource.swift b/submodules/TelegramUI/Components/Resources/FetchVideoMediaResource/Sources/FetchVideoMediaResource.swift
index 22d8e67ed5..23ade99f15 100644
--- a/submodules/TelegramUI/Components/Resources/FetchVideoMediaResource/Sources/FetchVideoMediaResource.swift
+++ b/submodules/TelegramUI/Components/Resources/FetchVideoMediaResource/Sources/FetchVideoMediaResource.swift
@@ -481,17 +481,46 @@ public func fetchLocalFileVideoMediaResource(postbox: Postbox, resource: LocalFi
     let signal = Signal<MediaResourceDataFetchResult, MediaResourceDataFetchError> { subscriber in
         subscriber.putNext(.reset)
         
-        var filteredPath = resource.path
-        if filteredPath.hasPrefix("file://") {
-            filteredPath = String(filteredPath[filteredPath.index(filteredPath.startIndex, offsetBy: "file://".count)])
+        let filteredPaths = resource.paths.map { path in
+            if path.hasPrefix("file://") {
+                return path.replacingOccurrences(of: "file://", with: "")
+            } else {
+                return path
+            }
         }
+        let filteredPath = filteredPaths.first ?? ""
         
         let defaultPreset = TGMediaVideoConversionPreset(rawValue: UInt32(UserDefaults.standard.integer(forKey: "TG_preferredVideoPreset_v0")))
         let qualityPreset = MediaQualityPreset(preset: defaultPreset)
         
         let isImage = filteredPath.contains(".jpg")
         var isStory = false
-        let avAsset = AVURLAsset(url: URL(fileURLWithPath: filteredPath))
+        let avAsset: AVAsset?
+        
+        if isImage {
+            avAsset = nil
+        } else if filteredPaths.count > 1 {
+            let composition = AVMutableComposition()
+            var currentTime = CMTime.zero
+            
+            for path in filteredPaths {
+                let asset = AVURLAsset(url: URL(fileURLWithPath: path))
+                let duration = asset.duration
+                do {
+                    try composition.insertTimeRange(
+                        CMTimeRangeMake(start: .zero, duration: duration),
+                        of: asset,
+                        at: currentTime
+                    )
+                    currentTime = CMTimeAdd(currentTime, duration)
+                } catch {
+                }
+            }
+            avAsset = composition
+        } else {
+            avAsset = AVURLAsset(url: URL(fileURLWithPath: filteredPath))
+        }
+        
         var adjustments: TGVideoEditAdjustments?
         var mediaEditorValues: MediaEditorValues?
         if let videoAdjustments = resource.adjustments {
@@ -500,26 +529,34 @@ public func fetchLocalFileVideoMediaResource(postbox: Postbox, resource: LocalFi
                 if let values = try? JSONDecoder().decode(MediaEditorValues.self, from: videoAdjustments.data.makeData()) {
                     mediaEditorValues = values
                 }
-            } else if let dict = legacy_unarchiveDeprecated(data: videoAdjustments.data.makeData()) as? [AnyHashable : Any], let legacyAdjustments = TGVideoEditAdjustments(dictionary: dict) {
-                if alwaysUseModernPipeline && !isImage {
-                    mediaEditorValues = MediaEditorValues(legacyAdjustments: legacyAdjustments, defaultPreset: qualityPreset)
-                } else {
-                    adjustments = legacyAdjustments
+            } else {
+                if let values = try? JSONDecoder().decode(MediaEditorValues.self, from: videoAdjustments.data.makeData()) {
+                    mediaEditorValues = values
+                } else if let dict = legacy_unarchiveDeprecated(data: videoAdjustments.data.makeData()) as? [AnyHashable : Any], let legacyAdjustments = TGVideoEditAdjustments(dictionary: dict) {
+                    if alwaysUseModernPipeline && !isImage {
+                        mediaEditorValues = MediaEditorValues(legacyAdjustments: legacyAdjustments, defaultPreset: qualityPreset)
+                    } else {
+                        adjustments = legacyAdjustments
+                    }
                 }
             }
         }
         let tempFile = EngineTempBox.shared.tempFile(fileName: "video.mp4")
         let updatedSize = Atomic<Int64>(value: 0)
         if let mediaEditorValues {
-            let duration: Double = avAsset.duration.seconds
-            let configuration = recommendedVideoExportConfiguration(values: mediaEditorValues, duration: duration, frameRate: 30.0)
+            let duration: Double
             let subject: MediaEditorVideoExport.Subject
             if isImage, let data = try? Data(contentsOf: URL(fileURLWithPath: filteredPath), options: [.mappedRead]), let image = UIImage(data: data) {
+                duration = 5.0
                 subject = .image(image: image)
-            } else {
+            } else if let avAsset {
+                duration = avAsset.duration.seconds
                 subject = .video(asset: avAsset, isStory: isStory)
+            } else {
+                return EmptyDisposable
             }
             
+            let configuration = recommendedVideoExportConfiguration(values: mediaEditorValues, duration: duration, frameRate: 30.0)
             let videoExport = MediaEditorVideoExport(postbox: postbox, subject: subject, configuration: configuration, outputPath: tempFile.path)
             videoExport.start()
             
diff --git a/submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift b/submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift
index 5f746112aa..006f7b232a 100644
--- a/submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift
+++ b/submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift
@@ -571,12 +571,12 @@ final class StoryItemSetContainerSendMessage {
             
             let controller = component.controller() as? StoryContainerScreen
             
-            if let recordedAudioPreview = self.recordedAudioPreview {
+            if let recordedAudioPreview = self.recordedAudioPreview, case let .audio(audio) = recordedAudioPreview {
                 self.recordedAudioPreview = nil
                 
-                let waveformBuffer = recordedAudioPreview.waveform.makeBitstream()
+                let waveformBuffer = audio.waveform.makeBitstream()
                 
-                let messages: [EnqueueMessage] = [.message(text: "", attributes: [], inlineStickers: [:], mediaReference: .standalone(media: TelegramMediaFile(fileId: EngineMedia.Id(namespace: Namespaces.Media.LocalFile, id: Int64.random(in: Int64.min ... Int64.max)), partialReference: nil, resource: recordedAudioPreview.resource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "audio/ogg", size: Int64(recordedAudioPreview.fileSize), attributes: [.Audio(isVoice: true, duration: Int(recordedAudioPreview.duration), title: nil, performer: nil, waveform: waveformBuffer)])), threadId: nil, replyToMessageId: nil, replyToStoryId: focusedStoryId, localGroupingKey: nil, correlationId: nil, bubbleUpEmojiOrStickersets: [])]
+                let messages: [EnqueueMessage] = [.message(text: "", attributes: [], inlineStickers: [:], mediaReference: .standalone(media: TelegramMediaFile(fileId: EngineMedia.Id(namespace: Namespaces.Media.LocalFile, id: Int64.random(in: Int64.min ... Int64.max)), partialReference: nil, resource: audio.resource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "audio/ogg", size: Int64(audio.fileSize), attributes: [.Audio(isVoice: true, duration: Int(audio.duration), title: nil, performer: nil, waveform: waveformBuffer)])), threadId: nil, replyToMessageId: nil, replyToStoryId: focusedStoryId, localGroupingKey: nil, correlationId: nil, bubbleUpEmojiOrStickersets: [])]
                 
                 let _ = enqueueMessages(account: component.context.account, peerId: peerId, messages: messages).start()
                 
@@ -939,7 +939,7 @@ final class StoryItemSetContainerSendMessage {
                     let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max), size: Int64(data.compressedData.count))
                     
                     component.context.account.postbox.mediaBox.storeResourceData(resource.id, data: data.compressedData)
-                    self.recordedAudioPreview = ChatRecordedMediaPreview(resource: resource, duration: Int32(data.duration), fileSize: Int32(data.compressedData.count), waveform: AudioWaveform(bitstream: waveform, bitsPerSample: 5))
+                    self.recordedAudioPreview = .audio(ChatRecordedMediaPreview.Audio(resource: resource, fileSize: Int32(data.compressedData.count), duration: Int32(data.duration), waveform: AudioWaveform(bitstream: waveform, bitsPerSample: 5)))
                     view.state?.updated(transition: Transition(animation: .curve(duration: 0.3, curve: .spring)))
                 }
             })
diff --git a/submodules/TelegramUI/Components/VideoMessageCameraScreen/BUILD b/submodules/TelegramUI/Components/VideoMessageCameraScreen/BUILD
new file mode 100644
index 0000000000..1ae3b7e2e8
--- /dev/null
+++ b/submodules/TelegramUI/Components/VideoMessageCameraScreen/BUILD
@@ -0,0 +1,44 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "VideoMessageCameraScreen",
+    module_name = "VideoMessageCameraScreen",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    copts = [
+        "-warnings-as-errors",
+    ],
+    deps = [
+        "//submodules/AsyncDisplayKit",
+        "//submodules/Display",
+        "//submodules/Postbox",
+        "//submodules/TelegramCore",
+        "//submodules/SSignalKit/SwiftSignalKit",
+        "//submodules/ComponentFlow",
+        "//submodules/Components/ViewControllerComponent",
+        "//submodules/Components/ComponentDisplayAdapters",
+        "//submodules/TelegramPresentationData",
+        "//submodules/AccountContext",
+        "//submodules/AppBundle",
+        "//submodules/TelegramStringFormatting",
+        "//submodules/PresentationDataUtils",
+        "//submodules/MediaResources",
+        "//submodules/LocalMediaResources",
+        "//submodules/ImageCompression",
+        "//submodules/Camera",
+        "//submodules/Components/MultilineTextComponent",
+        "//submodules/Components/BlurredBackgroundComponent",
+        "//submodules/Components/BundleIconComponent:BundleIconComponent",
+        "//submodules/TelegramUI/Components/ButtonComponent",
+        "//submodules/TelegramUI/Components/PlainButtonComponent",
+        "//submodules/TelegramUI/Components/CameraButtonComponent",
+        "//submodules/TooltipUI",
+        "//submodules/TelegramNotices",
+        "//submodules/DeviceAccess",
+        "//submodules/TelegramUI/Components/MediaEditor",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramUI/Components/VideoMessageCameraScreen/Sources/RecordingProgressView.swift b/submodules/TelegramUI/Components/VideoMessageCameraScreen/Sources/RecordingProgressView.swift
new file mode 100644
index 0000000000..14dd8120fa
--- /dev/null
+++ b/submodules/TelegramUI/Components/VideoMessageCameraScreen/Sources/RecordingProgressView.swift
@@ -0,0 +1,59 @@
+import Foundation
+import UIKit
+import Display
+
+private extension SimpleShapeLayer {
+    func animateStrokeStart(from: CGFloat, to: CGFloat, duration: Double, delay: Double = 0.0, timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: Bool = true, completion: ((Bool) -> ())? = nil) {
+        self.animate(from: NSNumber(value: Float(from)), to: NSNumber(value: Float(to)), keyPath: "strokeStart", timingFunction: timingFunction, duration: duration, delay: delay, removeOnCompletion: removeOnCompletion, completion: completion)
+    }
+    
+    func animateStrokeEnd(from: CGFloat, to: CGFloat, duration: Double, delay: Double = 0.0, timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: Bool = true, completion: ((Bool) -> ())? = nil) {
+        self.animate(from: NSNumber(value: Float(from)), to: NSNumber(value: Float(to)), keyPath: "strokeEnd", timingFunction: timingFunction, duration: duration, delay: delay, removeOnCompletion: removeOnCompletion, completion: completion)
+    }
+}
+
+final class RecordingProgressView: UIView {
+    let shapeLayer = SimpleShapeLayer()
+    
+    var value: CGFloat = 0.0 {
+        didSet {
+            if abs(self.shapeLayer.strokeEnd - self.value) >= 0.01 {
+                if abs(oldValue - self.value) < 0.1 {
+                    let previousStrokeEnd = self.shapeLayer.strokeEnd
+                    self.shapeLayer.strokeEnd = self.value
+                    self.shapeLayer.animateStrokeEnd(from: previousStrokeEnd, to: self.shapeLayer.strokeEnd, duration: abs(previousStrokeEnd - self.value) * 60.0, timingFunction: CAMediaTimingFunctionName.linear.rawValue)
+                } else {
+                    self.shapeLayer.strokeEnd = self.value
+                    self.shapeLayer.removeAllAnimations()
+                }
+            }
+        }
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        
+        self.shapeLayer.fillColor = UIColor.clear.cgColor
+        self.shapeLayer.strokeColor = UIColor(white: 1.0, alpha: 0.6).cgColor
+        self.shapeLayer.lineWidth = 4.0
+        self.shapeLayer.lineCap = .round
+        self.shapeLayer.transform = CATransform3DMakeRotation(-.pi / 2.0, 0.0, 0.0, 1.0)
+        self.shapeLayer.strokeEnd = 0.0
+        
+        self.layer.addSublayer(self.shapeLayer)
+    }
+    
+    required public init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        
+        if self.shapeLayer.frame != self.bounds {
+            self.shapeLayer.frame = self.bounds
+            
+            self.shapeLayer.path = CGPath(ellipseIn: self.bounds.insetBy(dx: self.shapeLayer.lineWidth, dy: self.shapeLayer.lineWidth), transform: nil)
+        }
+    }
+}
diff --git a/submodules/TelegramUI/Components/VideoMessageCameraScreen/Sources/ResultPreviewView.swift b/submodules/TelegramUI/Components/VideoMessageCameraScreen/Sources/ResultPreviewView.swift
new file mode 100644
index 0000000000..48222120b5
--- /dev/null
+++ b/submodules/TelegramUI/Components/VideoMessageCameraScreen/Sources/ResultPreviewView.swift
@@ -0,0 +1,119 @@
+import Foundation
+import UIKit
+import AVFoundation
+
+final class ResultPreviewView: UIView {
+    let composition: AVComposition
+    
+    let player: AVPlayer
+    let playerLayer: AVPlayerLayer
+    
+    var didPlayToEndTimeObserver: NSObjectProtocol?
+    
+    var trimRange: Range<Double>? {
+        didSet {
+            if let trimRange = self.trimRange {
+                self.player.currentItem?.forwardPlaybackEndTime = CMTime(seconds: trimRange.upperBound, preferredTimescale: CMTimeScale(1000))
+            } else {
+                self.player.currentItem?.forwardPlaybackEndTime = .invalid
+            }
+        }
+    }
+    
+    init(composition: AVComposition) {
+        self.composition = composition
+        
+        self.player = AVPlayer(playerItem: AVPlayerItem(asset: composition))
+        self.player.isMuted = true
+        
+        self.playerLayer = AVPlayerLayer(player: self.player)
+        
+        super.init(frame: .zero)
+        
+        self.layer.addSublayer(self.playerLayer)
+        
+        self.didPlayToEndTimeObserver = NotificationCenter.default.addObserver(forName: NSNotification.Name.AVPlayerItemDidPlayToEndTime, object: self.player.currentItem, queue: nil, using: { [weak self] notification in
+            guard let self else {
+                return
+            }
+            var start: Double = 0.0
+            if let trimRange = self.trimRange {
+                start = trimRange.lowerBound
+            }
+            self.player.pause()
+            self.seek(to: start, andPlay: true)
+        })
+        
+        self.player.play()
+    }
+    
+    required public init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    deinit {
+        if let didPlayToEndTimeObserver = self.didPlayToEndTimeObserver {
+            NotificationCenter.default.removeObserver(didPlayToEndTimeObserver)
+        }
+    }
+    
+    func updateTrimRange(start: Double, end: Double, updatedEnd: Bool, apply: Bool) {
+        if !apply {
+            self.player.pause()
+        } else {
+            self.trimRange = start..<end
+        }
+        let seekTo: Double
+        if updatedEnd && !apply {
+            seekTo = end
+        } else {
+            seekTo = start
+        }
+        self.seek(to: seekTo, andPlay: apply)
+    }
+    
+    func play() {
+        self.player.play()
+    }
+    
+    func pause() {
+        self.player.pause()
+    }
+    
+    private var targetTimePosition: (CMTime, Bool)?
+    private var updatingTimePosition = false
+    func seek(to seconds: Double, andPlay play: Bool) {
+        let position = CMTime(seconds: seconds, preferredTimescale: CMTimeScale(1000.0))
+        self.targetTimePosition = (position, play)
+        
+        if !self.updatingTimePosition {
+            self.updateVideoTimePosition()
+        }
+    }
+    
+    private func updateVideoTimePosition() {
+        guard let (targetPosition, _) = self.targetTimePosition else {
+            return
+        }
+        self.updatingTimePosition = true
+        
+        self.player.seek(to: targetPosition, toleranceBefore: .zero, toleranceAfter: .zero, completionHandler: { [weak self] _ in
+            if let self {
+                if let (currentTargetPosition, play) = self.targetTimePosition, currentTargetPosition == targetPosition {
+                    self.updatingTimePosition = false
+                    self.targetTimePosition = nil
+                    
+                    if play {
+                        self.player.play()
+                    }
+                } else {
+                    self.updateVideoTimePosition()
+                }
+            }
+        })
+    }
+    
+    override func layoutSubviews() {
+        self.playerLayer.frame = self.bounds
+    }
+}
diff --git a/submodules/TelegramUI/Components/VideoMessageCameraScreen/Sources/VideoMessageCameraScreen.swift b/submodules/TelegramUI/Components/VideoMessageCameraScreen/Sources/VideoMessageCameraScreen.swift
new file mode 100644
index 0000000000..8ca4d566c8
--- /dev/null
+++ b/submodules/TelegramUI/Components/VideoMessageCameraScreen/Sources/VideoMessageCameraScreen.swift
@@ -0,0 +1,1314 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import ComponentFlow
+import SwiftSignalKit
+import ViewControllerComponent
+import ComponentDisplayAdapters
+import TelegramPresentationData
+import AccountContext
+import Postbox
+import TelegramCore
+import PresentationDataUtils
+import Camera
+import MultilineTextComponent
+import BlurredBackgroundComponent
+import PlainButtonComponent
+import Photos
+import TooltipUI
+import BundleIconComponent
+import CameraButtonComponent
+import TelegramNotices
+import DeviceAccess
+import MediaEditor
+import MediaResources
+import LocalMediaResources
+import ImageCompression
+
+struct CameraState: Equatable {
+    enum Recording: Equatable {
+        case none
+        case holding
+        case handsFree
+    }
+    
+    let position: Camera.Position
+    let recording: Recording
+    let duration: Double
+    let isDualCameraEnabled: Bool
+    let isViewOnceEnabled: Bool
+    
+    func updatedPosition(_ position: Camera.Position) -> CameraState {
+        return CameraState(position: position, recording: self.recording, duration: self.duration, isDualCameraEnabled: self.isDualCameraEnabled, isViewOnceEnabled: self.isViewOnceEnabled)
+    }
+
+    func updatedRecording(_ recording: Recording) -> CameraState {
+        return CameraState(position: self.position, recording: recording, duration: self.duration, isDualCameraEnabled: self.isDualCameraEnabled, isViewOnceEnabled: self.isViewOnceEnabled)
+    }
+    
+    func updatedDuration(_ duration: Double) -> CameraState {
+        return CameraState(position: self.position, recording: self.recording, duration: duration, isDualCameraEnabled: self.isDualCameraEnabled, isViewOnceEnabled: self.isViewOnceEnabled)
+    }
+    
+    func updatedIsViewOnceEnabled(_ isViewOnceEnabled: Bool) -> CameraState {
+        return CameraState(position: self.position, recording: self.recording, duration: self.duration, isDualCameraEnabled: self.isDualCameraEnabled, isViewOnceEnabled: isViewOnceEnabled)
+    }
+}
+
+struct PreviewState: Equatable {
+    let composition: AVComposition
+    let trimRange: Range<Double>?
+}
+
+enum CameraScreenTransition {
+    case animateIn
+    case animateOut
+    case finishedAnimateIn
+}
+
+private let viewOnceButtonTag = GenericComponentViewTag()
+
+private final class CameraScreenComponent: CombinedComponent {
+    typealias EnvironmentType = ViewControllerComponentContainer.Environment
+    
+    let context: AccountContext
+    let cameraState: CameraState
+    let isPreviewing: Bool
+    let getController: () -> VideoMessageCameraScreen?
+    let present: (ViewController) -> Void
+    let push: (ViewController) -> Void
+    let startRecording: ActionSlot<Void>
+    let stopRecording: ActionSlot<Void>
+    let completion: ActionSlot<VideoMessageCameraScreen.CaptureResult>
+    
+    init(
+        context: AccountContext,
+        cameraState: CameraState,
+        isPreviewing: Bool,
+        getController: @escaping () -> VideoMessageCameraScreen?,
+        present: @escaping (ViewController) -> Void,
+        push: @escaping (ViewController) -> Void,
+        startRecording: ActionSlot<Void>,
+        stopRecording: ActionSlot<Void>,
+        completion: ActionSlot<VideoMessageCameraScreen.CaptureResult>
+    ) {
+        self.context = context
+        self.cameraState = cameraState
+        self.isPreviewing = isPreviewing
+        self.getController = getController
+        self.present = present
+        self.push = push
+        self.startRecording = startRecording
+        self.stopRecording = stopRecording
+        self.completion = completion
+    }
+    
+    static func ==(lhs: CameraScreenComponent, rhs: CameraScreenComponent) -> Bool {
+        if lhs.context !== rhs.context {
+            return false
+        }
+        if lhs.cameraState != rhs.cameraState {
+            return false
+        }
+        if lhs.isPreviewing != rhs.isPreviewing {
+            return false
+        }
+        return true
+    }
+    
+    final class State: ComponentState {
+        enum ImageKey: Hashable {
+            case flip
+            case buttonBackground
+        }
+        private var cachedImages: [ImageKey: UIImage] = [:]
+        func image(_ key: ImageKey, theme: PresentationTheme) -> UIImage {
+            if let image = self.cachedImages[key] {
+                return image
+            } else {
+                var image: UIImage
+                switch key {
+                case .flip:
+                    image = UIImage(bundleImageName: "Camera/VideoMessageFlip")!.withRenderingMode(.alwaysTemplate)
+                case .buttonBackground:
+                    let innerSize = CGSize(width: 40.0, height: 40.0)
+                    image = generateFilledCircleImage(diameter: innerSize.width, color: theme.rootController.navigationBar.opaqueBackgroundColor, strokeColor: theme.chat.inputPanel.panelSeparatorColor, strokeWidth: 0.5, backgroundColor: nil)!
+                }
+                cachedImages[key] = image
+                return image
+            }
+        }
+                
+        private let context: AccountContext
+        private let present: (ViewController) -> Void
+        private let startRecording: ActionSlot<Void>
+        private let stopRecording: ActionSlot<Void>
+        private let completion: ActionSlot<VideoMessageCameraScreen.CaptureResult>
+        private let getController: () -> VideoMessageCameraScreen?
+        
+        private var resultDisposable = MetaDisposable()
+                
+        var cameraState: CameraState?
+                    
+        private let hapticFeedback = HapticFeedback()
+        
+        init(
+            context: AccountContext,
+            present: @escaping (ViewController) -> Void,
+            startRecording: ActionSlot<Void>,
+            stopRecording: ActionSlot<Void>,
+            completion: ActionSlot<VideoMessageCameraScreen.CaptureResult>,
+            getController: @escaping () -> VideoMessageCameraScreen? = {
+                return nil
+            }
+        ) {
+            self.context = context
+            self.present = present
+            self.startRecording = startRecording
+            self.stopRecording = stopRecording
+            self.completion = completion
+            self.getController = getController
+            
+            super.init()
+            
+            self.startRecording.connect({ [weak self] _ in
+                self?.startVideoRecording(pressing: true)
+            })
+            self.stopRecording.connect({ [weak self] _ in
+                self?.stopVideoRecording()
+            })
+        }
+        
+        deinit {
+            self.resultDisposable.dispose()
+        }
+        
+        func toggleViewOnce() {
+            guard let controller = self.getController() else {
+                return
+            }
+            controller.updateCameraState({ $0.updatedIsViewOnceEnabled(!$0.isViewOnceEnabled) }, transition: .easeInOut(duration: 0.2))
+        }
+        
+        private var lastFlipTimestamp: Double?
+        func togglePosition() {
+            guard let controller = self.getController(), let camera = controller.camera else {
+                return
+            }
+            let currentTimestamp = CACurrentMediaTime()
+            if let lastFlipTimestamp = self.lastFlipTimestamp, currentTimestamp - lastFlipTimestamp < 1.0 {
+                return
+            }
+            self.lastFlipTimestamp = currentTimestamp
+            
+            camera.togglePosition()
+                        
+            self.hapticFeedback.impact(.veryLight)
+        }
+        
+        func startVideoRecording(pressing: Bool) {
+            guard let controller = self.getController(), let camera = controller.camera else {
+                return
+            }
+            guard case .none = controller.cameraState.recording else {
+                return
+            }
+            
+            let initialDuration = controller.node.previewState?.composition.duration.seconds ?? 0.0
+            controller.updatePreviewState({ _ in return nil}, transition: .spring(duration: 0.4))
+            
+            controller.node.dismissAllTooltips()
+            controller.updateCameraState({ $0.updatedRecording(pressing ? .holding : .handsFree).updatedDuration(initialDuration) }, transition: .spring(duration: 0.4))
+            
+            let isFirstTime = !controller.node.cameraIsActive
+            controller.node.resumeCameraCapture()
+            
+            controller.node.withReadyCamera(isFirstTime: isFirstTime) {
+                self.resultDisposable.set((camera.startRecording()
+                |> deliverOnMainQueue).start(next: { [weak self] duration in
+                    let duration = initialDuration + duration
+                    if let self, let controller = self.getController() {
+                        controller.updateCameraState({ $0.updatedDuration(duration) }, transition: .easeInOut(duration: 0.1))
+                        if duration > 59.0 {
+                            self.stopVideoRecording()
+                        }
+                    }
+                }))
+            }
+            
+            if initialDuration > 0.0 {
+                controller.onResume()
+            }
+        }
+        
+        func stopVideoRecording() {
+            guard let controller = self.getController(), let camera = controller.camera else {
+                return
+            }
+            
+            self.resultDisposable.set((camera.stopRecording()
+            |> deliverOnMainQueue).start(next: { [weak self] result in
+                if let self, let controller = self.getController(), case let .finished(mainResult, _, duration, _, _) = result {
+                    self.completion.invoke(
+                        .video(VideoMessageCameraScreen.CaptureResult.Video(
+                            videoPath: mainResult.path,
+                            dimensions: PixelDimensions(mainResult.dimensions),
+                            duration: duration,
+                            thumbnail: mainResult.thumbnail
+                        ))
+                    )
+                    controller.updateCameraState({ $0.updatedRecording(.none) }, transition: .spring(duration: 0.4))
+                }
+            }))
+        }
+        
+        func lockVideoRecording() {
+            guard let controller = self.getController() else {
+                return
+            }
+            controller.updateCameraState({ $0.updatedRecording(.handsFree) }, transition: .spring(duration: 0.4))
+        }
+        
+        func updateZoom(fraction: CGFloat) {
+            guard let camera = self.getController()?.camera else {
+                return
+            }
+            camera.setZoomLevel(fraction)
+        }
+    }
+    
+    func makeState() -> State {
+        return State(context: self.context, present: self.present, startRecording: self.startRecording, stopRecording: self.stopRecording, completion: self.completion, getController: self.getController)
+    }
+    
+    static var body: Body {
+        let flipButton = Child(CameraButton.self)
+        
+        let viewOnceButton = Child(PlainButtonComponent.self)
+        let recordMoreButton = Child(PlainButtonComponent.self)
+                        
+        return { context in
+            let environment = context.environment[ViewControllerComponentContainer.Environment.self].value
+            let component = context.component
+            let state = context.state
+            let availableSize = context.availableSize
+            
+            state.cameraState = component.cameraState
+            
+            var viewOnceOffset: CGFloat = 102.0
+            
+            var showViewOnce = false
+            var showRecordMore = false
+            if component.isPreviewing {
+                showViewOnce = true
+                showRecordMore = true
+                
+                viewOnceOffset = 67.0
+            } else if case .handsFree = component.cameraState.recording {
+                showViewOnce = true
+            }
+            
+            if !component.isPreviewing {
+                let flipButton = flipButton.update(
+                    component: CameraButton(
+                        content: AnyComponentWithIdentity(
+                            id: "flip",
+                            component: AnyComponent(
+                                Image(
+                                    image: state.image(.flip, theme: environment.theme),
+                                    tintColor: environment.theme.list.itemAccentColor,
+                                    size: CGSize(width: 30.0, height: 30.0)
+                                )
+                            )
+                        ),
+                        minSize: CGSize(width: 44.0, height: 44.0),
+                        action: { [weak state] in
+                            if let state {
+                                state.togglePosition()
+                            }
+                        }
+                    ),
+                    availableSize: availableSize,
+                    transition: context.transition
+                )
+                context.add(flipButton
+                    .position(CGPoint(x: flipButton.size.width / 2.0 + 8.0, y: availableSize.height - flipButton.size.height / 2.0 - 8.0))
+                    .appear(.default(scale: true, alpha: true))
+                    .disappear(.default(scale: true, alpha: true))
+                )
+            }
+            
+            if showViewOnce {
+                let viewOnceButton = viewOnceButton.update(
+                    component: PlainButtonComponent(
+                        content: AnyComponent(
+                            ZStack([
+                                AnyComponentWithIdentity(
+                                    id: "background",
+                                    component: AnyComponent(
+                                        Image(
+                                            image: state.image(.buttonBackground, theme: environment.theme),
+                                            size: CGSize(width: 40.0, height: 40.0)
+                                        )
+                                    )
+                                ),
+                                AnyComponentWithIdentity(
+                                    id: "icon",
+                                    component: AnyComponent(
+                                        BundleIconComponent(
+                                            name: component.cameraState.isViewOnceEnabled ? "Media Gallery/ViewOnceEnabled" : "Media Gallery/ViewOnce",
+                                            tintColor: environment.theme.list.itemAccentColor
+                                        )
+                                    )
+                                )
+                            ])
+                        ),
+                        effectAlignment: .center,
+                        action: { [weak state] in
+                            if let state {
+                                state.toggleViewOnce()
+                            }
+                        },
+                        animateAlpha: false,
+                        tag: viewOnceButtonTag
+                    ),
+                    availableSize: availableSize,
+                    transition: context.transition
+                )
+                context.add(viewOnceButton
+                    .position(CGPoint(x: availableSize.width - viewOnceButton.size.width / 2.0 - 2.0 - UIScreenPixel, y: availableSize.height - viewOnceButton.size.height / 2.0 - 8.0 - viewOnceOffset))
+                    .appear(.default(scale: true, alpha: true))
+                    .disappear(.default(scale: true, alpha: true))
+                )
+            }
+            
+            if showRecordMore {
+                let recordMoreButton = recordMoreButton.update(
+                    component: PlainButtonComponent(
+                        content: AnyComponent(
+                            ZStack([
+                                AnyComponentWithIdentity(
+                                    id: "background",
+                                    component: AnyComponent(
+                                        Image(
+                                            image: state.image(.buttonBackground, theme: environment.theme),
+                                            size: CGSize(width: 40.0, height: 40.0)
+                                        )
+                                    )
+                                ),
+                                AnyComponentWithIdentity(
+                                    id: "icon",
+                                    component: AnyComponent(
+                                        BundleIconComponent(
+                                            name: "Chat/Input/Text/IconVideo",
+                                            tintColor: environment.theme.list.itemAccentColor
+                                        )
+                                    )
+                                )
+                            ])
+                        ),
+                        effectAlignment: .center,
+                        action: { [weak state] in
+                            state?.startVideoRecording(pressing: false)
+                        }
+                    ),
+                    availableSize: availableSize,
+                    transition: context.transition
+                )
+                context.add(recordMoreButton
+                    .position(CGPoint(x: availableSize.width - recordMoreButton.size.width / 2.0 - 2.0 - UIScreenPixel, y: availableSize.height - recordMoreButton.size.height / 2.0 - 22.0))
+                    .appear(.default(scale: true, alpha: true))
+                    .disappear(.default(scale: true, alpha: true))
+                )
+            }
+            
+//            var isVideoRecording = false
+//            if case .video = component.cameraState.mode {
+//                isVideoRecording = true
+//            } else if component.cameraState.recording != .none {
+//                isVideoRecording = true
+//            }
+            
+           
+            return availableSize
+        }
+    }
+}
+
+public class VideoMessageCameraScreen: ViewController {
+    public enum CaptureResult {
+        public struct Video {
+            public let videoPath: String
+            public let dimensions: PixelDimensions
+            public let duration: Double
+            public let thumbnail: UIImage
+        }
+        
+        case video(Video)
+    }
+    
+    fileprivate final class Node: ViewControllerTracingNode, UIGestureRecognizerDelegate {
+        private weak var controller: VideoMessageCameraScreen?
+        private let context: AccountContext
+        fileprivate var camera: Camera?
+        private let updateState: ActionSlot<CameraState>
+        
+        fileprivate let backgroundView: UIVisualEffectView
+        fileprivate let containerView: UIView
+        fileprivate let componentHost: ComponentView<ViewControllerComponentContainer.Environment>
+        fileprivate let previewContainerView: UIView
+        
+        fileprivate var mainPreviewView: CameraSimplePreviewView
+        fileprivate var additionalPreviewView: CameraSimplePreviewView
+        private var progressView: RecordingProgressView
+        
+        private var resultPreviewView: ResultPreviewView?
+             
+        private var cameraStateDisposable: Disposable?
+        private var changingPositionDisposable: Disposable?
+                
+        private let idleTimerExtensionDisposable = MetaDisposable()
+        
+        fileprivate var cameraIsActive = true {
+            didSet {
+                if self.cameraIsActive {
+                    self.idleTimerExtensionDisposable.set(self.context.sharedContext.applicationBindings.pushIdleTimerExtension())
+                } else {
+                    self.idleTimerExtensionDisposable.set(nil)
+                }
+            }
+        }
+        
+        private var presentationData: PresentationData
+        private var validLayout: ContainerViewLayout?
+        
+        fileprivate var didAppear: () -> Void = {}
+        
+        fileprivate let startRecording = ActionSlot<Void>()
+        fileprivate let stopRecording = ActionSlot<Void>()
+        private let completion = ActionSlot<VideoMessageCameraScreen.CaptureResult>()
+        
+        var cameraState: CameraState {
+            didSet {
+                if self.cameraState.isViewOnceEnabled != oldValue.isViewOnceEnabled {
+                    if self.cameraState.isViewOnceEnabled {
+                        let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
+                        self.displayViewOnceTooltip(text: presentationData.strings.Chat_PlayVideoMessageOnceTooltip, hasIcon: false)
+                    } else {
+                        self.dismissAllTooltips()
+                    }
+                }
+            }
+        }
+        var previewState: PreviewState? {
+            didSet {
+                self.previewStatePromise.set(.single(self.previewState))
+            }
+        }
+        var previewStatePromise = Promise<PreviewState?>()
+        
+        init(controller: VideoMessageCameraScreen) {
+            self.controller = controller
+            self.context = controller.context
+            self.updateState = ActionSlot<CameraState>()
+            
+            self.presentationData = controller.updatedPresentationData?.initial ?? self.context.sharedContext.currentPresentationData.with { $0 }
+            
+            self.backgroundView = UIVisualEffectView(effect: UIBlurEffect(style: self.presentationData.theme.overallDarkAppearance ? .dark : .light))
+            
+            self.containerView = UIView()
+            self.containerView.clipsToBounds = true
+            
+            self.componentHost = ComponentView<ViewControllerComponentContainer.Environment>()
+            
+            self.previewContainerView = UIView()
+            self.previewContainerView.clipsToBounds = true
+                        
+            let isDualCameraEnabled = Camera.isDualCameraSupported
+            let isFrontPosition = "".isEmpty
+            
+            self.mainPreviewView = CameraSimplePreviewView(frame: .zero, main: true)
+            self.additionalPreviewView = CameraSimplePreviewView(frame: .zero, main: false)
+            
+            self.progressView = RecordingProgressView(frame: .zero)
+            
+            if isDualCameraEnabled {
+                self.mainPreviewView.resetPlaceholder(front: false)
+                self.additionalPreviewView.resetPlaceholder(front: true)
+            } else {
+                self.mainPreviewView.resetPlaceholder(front: isFrontPosition)
+            }
+            
+            self.cameraState = CameraState(
+                position: isFrontPosition ? .front : .back,
+                recording: .none,
+                duration: 0.0,
+                isDualCameraEnabled: isDualCameraEnabled,
+                isViewOnceEnabled: false
+            )
+            
+            self.previewState = nil
+                        
+            super.init()
+            
+            self.backgroundColor = .clear
+            
+            self.view.addSubview(self.backgroundView)
+            self.view.addSubview(self.containerView)
+            
+            self.containerView.addSubview(self.previewContainerView)
+
+            self.previewContainerView.addSubview(self.mainPreviewView)
+            self.previewContainerView.addSubview(self.additionalPreviewView)
+            self.previewContainerView.addSubview(self.progressView)
+                        
+            self.completion.connect { [weak self] result in
+                if let self {
+                    self.addCaptureResult(result)
+                }
+            }
+            
+            self.mainPreviewView.removePlaceholder(delay: 0.0)
+            self.withReadyCamera(isFirstTime: true, {
+                self.additionalPreviewView.removePlaceholder(delay: 0.35)
+                self.startRecording.invoke(Void())
+            })
+                        
+            self.idleTimerExtensionDisposable.set(self.context.sharedContext.applicationBindings.pushIdleTimerExtension())
+            
+            self.setupCamera()
+        }
+        
+        deinit {
+            self.cameraStateDisposable?.dispose()
+            self.changingPositionDisposable?.dispose()
+            self.idleTimerExtensionDisposable.dispose()
+        }
+        
+        func withReadyCamera(isFirstTime: Bool = false, _ f: @escaping () -> Void) {
+            if #available(iOS 13.0, *) {
+                let _ = (self.additionalPreviewView.isPreviewing
+                |> filter { $0 }
+                |> take(1)).startStandalone(next: { _ in
+                    f()
+                })
+            } else {
+                Queue.mainQueue().after(0.35) {
+                    f()
+                }
+            }
+        }
+        
+        override func didLoad() {
+            super.didLoad()
+            
+            self.view.disablesInteractiveModalDismiss = true
+            self.view.disablesInteractiveKeyboardGestureRecognizer = true
+            
+            let pinchGestureRecognizer = UIPinchGestureRecognizer(target: self, action: #selector(self.handlePinch(_:)))
+            self.view.addGestureRecognizer(pinchGestureRecognizer)
+        }
+                
+        private func setupCamera() {
+            guard self.camera == nil else {
+                return
+            }
+            
+            let camera = Camera(
+                configuration: Camera.Configuration(
+                    preset: .hd1920x1080,
+                    position: self.cameraState.position,
+                    isDualEnabled: self.cameraState.isDualCameraEnabled,
+                    audio: true,
+                    photo: true,
+                    metadata: false,
+                    isRoundVideo: true
+                ),
+                previewView: self.mainPreviewView,
+                secondaryPreviewView: self.additionalPreviewView
+            )
+            
+            self.cameraStateDisposable = (camera.position
+            |> deliverOnMainQueue).start(next: { [weak self] position in
+                guard let self else {
+                    return
+                }
+                self.cameraState = self.cameraState.updatedPosition(position)
+                self.requestUpdateLayout(transition: .easeInOut(duration: 0.2))
+            })
+            
+            self.changingPositionDisposable = (camera.modeChange
+            |> deliverOnMainQueue).start(next: { [weak self] modeChange in
+                if let self {
+                   let _ = self
+                }
+            })
+            
+            camera.focus(at: CGPoint(x: 0.5, y: 0.5), autoFocus: true)
+            camera.startCapture()
+            
+            self.camera = camera
+        }
+        
+        @objc private func handlePinch(_ gestureRecognizer: UIPinchGestureRecognizer) {
+            guard let camera = self.camera else {
+                return
+            }
+            switch gestureRecognizer.state {
+            case .changed:
+                let scale = gestureRecognizer.scale
+                camera.setZoomDelta(scale)
+                gestureRecognizer.scale = 1.0
+            case .ended, .cancelled:
+                camera.rampZoom(1.0, rate: 8.0)
+            default:
+                break
+            }
+        }
+                
+        private var animatingIn = false
+        func animateIn() {
+            self.animatingIn = true
+            
+            self.backgroundView.alpha = 0.0
+            UIView.animate(withDuration: 0.4, animations: {
+                self.backgroundView.alpha = 1.0
+            })
+            
+            let targetPosition = self.previewContainerView.center
+            self.previewContainerView.center = CGPoint(x: targetPosition.x, y: self.frame.height + self.previewContainerView.frame.height / 2.0)
+            
+            UIView.animate(withDuration: 0.5, delay: 0.0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0.2, animations: {
+                self.previewContainerView.center = targetPosition
+            }, completion: { _ in
+                self.animatingIn = false
+            })
+            
+            if let view = self.componentHost.view {
+                view.layer.animateAlpha(from: 0.1, to: 1.0, duration: 0.25)
+            }
+        }
+
+        func animateOut(completion: @escaping () -> Void) {
+            self.camera?.stopCapture(invalidate: true)
+                                    
+            UIView.animate(withDuration: 0.25, animations: {
+                self.backgroundView.alpha = 0.0
+            }, completion: { _ in
+                completion()
+            })
+            
+            self.componentHost.view?.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
+            self.previewContainerView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.25, removeOnCompletion: false)
+        }
+        
+        func pauseCameraCapture() {
+            self.mainPreviewView.isEnabled = false
+            self.additionalPreviewView.isEnabled = false
+            self.camera?.stopCapture()
+            
+            self.cameraIsActive = false
+            self.requestUpdateLayout(transition: .immediate)
+        }
+        
+        func resumeCameraCapture() {
+            if !self.mainPreviewView.isEnabled {
+                self.mainPreviewView.isEnabled = true
+                self.additionalPreviewView.isEnabled = true
+                self.camera?.startCapture()
+                
+                self.cameraIsActive = true
+                self.requestUpdateLayout(transition: .immediate)
+            }
+        }
+        
+        fileprivate var results: [VideoMessageCameraScreen.CaptureResult] = []
+        fileprivate var resultsPipe = ValuePipe<VideoMessageCameraScreen.CaptureResult>()
+        
+        func addCaptureResult(_ result: VideoMessageCameraScreen.CaptureResult) {
+            guard let controller = self.controller else {
+                return
+            }
+            
+            self.pauseCameraCapture()
+            
+            self.results.append(result)
+            self.resultsPipe.putNext(result)
+            
+            let composition = composition(with: self.results)
+            controller.updatePreviewState({ _ in
+                return PreviewState(composition: composition, trimRange: nil)
+            }, transition: .spring(duration: 0.4))
+            
+//            #if DEBUG
+//            if case let .video(video) = result {
+//                self.debugSaveResult(path: video.videoPath)
+//            }
+//            #endif
+        }
+        
+        private func debugSaveResult(path: String) {
+            guard let data = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedIfSafe) else {
+                return
+            }
+            let id = Int64.random(in: Int64.min ... Int64.max)
+            let fileResource = LocalFileReferenceMediaResource(localFilePath: path, randomId: id)
+            
+            let file = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: id), partialReference: nil, resource: fileResource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: Int64(data.count), attributes: [.FileName(fileName: "video.mp4")])
+            let message: EnqueueMessage = .message(text: "", attributes: [], inlineStickers: [:], mediaReference: .standalone(media: file), threadId: nil, replyToMessageId: nil, replyToStoryId: nil, localGroupingKey: nil, correlationId: nil, bubbleUpEmojiOrStickersets: [])
+
+            let _ = enqueueMessages(account: self.context.engine.account, peerId: self.context.engine.account.peerId, messages: [message]).start()
+        }
+        
+        override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+            let result = super.hitTest(point, with: event)
+            if let controller = self.controller, point.y > self.frame.height - controller.inputPanelFrame.height - 34.0 {
+                return nil
+            }
+            return result
+        }
+        
+        fileprivate func maybePresentViewOnceTooltip() {
+            let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
+            let _ = (ApplicationSpecificNotice.getVideoMessagesPlayOnceSuggestion(accountManager: context.sharedContext.accountManager)
+            |> deliverOnMainQueue).startStandalone(next: { [weak self] counter in
+                guard let self else {
+                    return
+                }
+                if counter >= 3 {
+                    return
+                }
+
+                Queue.mainQueue().after(0.3) {
+                    self.displayViewOnceTooltip(text: presentationData.strings.Chat_TapToPlayVideoMessageOnceTooltip, hasIcon: true)
+                }
+            
+                let _ = ApplicationSpecificNotice.incrementVideoMessagesPlayOnceSuggestion(accountManager: context.sharedContext.accountManager).startStandalone()
+            })
+        }
+        
+        private func displayViewOnceTooltip(text: String, hasIcon: Bool) {
+            guard let controller = self.controller, let sourceView = self.componentHost.findTaggedView(tag: viewOnceButtonTag) else {
+                return
+            }
+            
+            self.dismissAllTooltips()
+            
+            let absoluteFrame = sourceView.convert(sourceView.bounds, to: self.view)
+            let location = CGRect(origin: CGPoint(x: absoluteFrame.midX - 20.0, y: absoluteFrame.midY), size: CGSize())
+            
+            let tooltipController = TooltipScreen(
+                account: context.account,
+                sharedContext: context.sharedContext,
+                text: .markdown(text: text),
+                balancedTextLayout: true,
+                constrainWidth: 240.0,
+                style: .customBlur(UIColor(rgb: 0x18181a), 0.0),
+                arrowStyle: .small,
+                icon: hasIcon ? .animation(name: "anim_autoremove_on", delay: 0.1, tintColor: nil) : nil,
+                location: .point(location, .right),
+                displayDuration: .default,
+                inset: 8.0,
+                cornerRadius: 8.0,
+                shouldDismissOnTouch: { _, _ in
+                    return .ignore
+                }
+            )
+            controller.present(tooltipController, in: .window(.root))
+        }
+
+        fileprivate func dismissAllTooltips() {
+            guard let controller = self.controller else {
+                return
+            }
+            controller.window?.forEachController({ controller in
+                if let controller = controller as? TooltipScreen {
+                    controller.dismiss()
+                }
+            })
+            controller.forEachController({ controller in
+                if let controller = controller as? TooltipScreen {
+                    controller.dismiss()
+                }
+                return true
+            })
+        }
+        
+        func updateTrimRange(start: Double, end: Double, updatedEnd: Bool, apply: Bool) {
+            self.resultPreviewView?.updateTrimRange(start: start, end: end, updatedEnd: updatedEnd, apply: apply)
+            self.controller?.updatePreviewState({ state in
+                if let state {
+                    return PreviewState(composition: state.composition, trimRange: start..<end)
+                } else {
+                    return nil
+                }
+            }, transition: .immediate)
+        }
+        
+        func requestUpdateLayout(transition: Transition) {
+            if let layout = self.validLayout {
+                self.containerLayoutUpdated(layout: layout, forceUpdate: true, transition: transition)
+            }
+        }
+
+        func containerLayoutUpdated(layout: ContainerViewLayout, forceUpdate: Bool = false, transition: Transition) {
+            guard let controller = self.controller else {
+                return
+            }
+            let isFirstTime = self.validLayout == nil
+            self.validLayout = layout
+            
+//            let isTablet = layout.metrics.isTablet
+            
+            let environment = ViewControllerComponentContainer.Environment(
+                statusBarHeight: layout.statusBarHeight ?? 0.0,
+                navigationHeight: 0.0,
+                safeInsets: UIEdgeInsets(
+                    top: (layout.statusBarHeight ?? 0.0) + 5.0,
+                    left: layout.safeInsets.left,
+                    bottom: 44.0,
+                    right: layout.safeInsets.right
+                ),
+                inputHeight: layout.inputHeight ?? 0.0,
+                metrics: layout.metrics,
+                deviceMetrics: layout.deviceMetrics,
+                orientation: nil,
+                isVisible: true,
+                theme: self.presentationData.theme,
+                strings: self.presentationData.strings,
+                dateTimeFormat: self.presentationData.dateTimeFormat,
+                controller: { [weak self] in
+                    return self?.controller
+                }
+            )
+
+            if isFirstTime {
+                self.didAppear()
+            }
+
+            let backgroundFrame = CGRect(origin: .zero, size: CGSize(width: layout.size.width, height: layout.size.height - controller.inputPanelFrame.height - layout.intrinsicInsets.bottom))
+            
+            let componentSize = self.componentHost.update(
+                transition: transition,
+                component: AnyComponent(
+                    CameraScreenComponent(
+                        context: self.context,
+                        cameraState: self.cameraState,
+                        isPreviewing: self.previewState != nil,
+                        getController: { [weak self] in
+                            return self?.controller
+                        },
+                        present: { [weak self] c in
+                            self?.controller?.present(c, in: .window(.root))
+                        },
+                        push: { [weak self] c in
+                            self?.controller?.push(c)
+                        },
+                        startRecording: self.startRecording,
+                        stopRecording: self.stopRecording,
+                        completion: self.completion
+                    )
+                ),
+                environment: {
+                    environment
+                },
+                forceUpdate: forceUpdate,
+                containerSize: backgroundFrame.size
+            )
+            if let componentView = self.componentHost.view {
+                if componentView.superview == nil {
+                    self.containerView.addSubview(componentView)
+                    componentView.clipsToBounds = true
+                }
+            
+                let componentFrame = CGRect(origin: .zero, size: componentSize)
+                transition.setFrame(view: componentView, frame: componentFrame)
+            }
+            
+            transition.setPosition(view: self.backgroundView, position: backgroundFrame.center)
+            transition.setBounds(view: self.backgroundView, bounds: CGRect(origin: .zero, size: backgroundFrame.size))
+            
+            transition.setPosition(view: self.containerView, position: backgroundFrame.center)
+            transition.setBounds(view: self.containerView, bounds: CGRect(origin: .zero, size: backgroundFrame.size))
+                        
+            let previewSide = min(369.0, layout.size.width - 24.0)
+            let previewFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((layout.size.width - previewSide) / 2.0), y: max(90.0, layout.size.height * 0.4 - previewSide / 2.0)), size: CGSize(width: previewSide, height: previewSide))
+            
+            if !self.animatingIn {
+                transition.setFrame(view: self.previewContainerView, frame: previewFrame)
+            }
+            transition.setCornerRadius(layer: self.previewContainerView.layer, cornerRadius: previewSide / 2.0)
+                        
+            let previewInnerFrame = CGRect(origin: .zero, size: previewFrame.size)
+            
+            let additionalPreviewSize = CGSize(width: previewFrame.size.width, height: previewFrame.size.width / 3.0 * 4.0)
+            let additionalPreviewInnerFrame = CGRect(origin: CGPoint(x: 0.0, y: floorToScreenPixels((previewFrame.height - additionalPreviewSize.height) / 2.0)), size: additionalPreviewSize)
+            self.mainPreviewView.frame = previewInnerFrame
+            self.additionalPreviewView.frame = additionalPreviewInnerFrame
+            
+            self.progressView.frame = previewInnerFrame
+            self.progressView.value = CGFloat(self.cameraState.duration / 60.0)
+
+            transition.setAlpha(view: self.additionalPreviewView, alpha: self.cameraState.position == .front ? 1.0 : 0.0)
+            
+            if let previewState = self.previewState {
+                if previewState.composition !== self.resultPreviewView?.composition {
+                    self.resultPreviewView?.removeFromSuperview()
+                    self.resultPreviewView = nil
+                }
+                
+                let resultPreviewView: ResultPreviewView
+                if let current = self.resultPreviewView {
+                    resultPreviewView = current
+                } else {
+                    resultPreviewView = ResultPreviewView(composition: previewState.composition)
+                    self.previewContainerView.addSubview(resultPreviewView)
+                    
+                    self.resultPreviewView = resultPreviewView
+                    resultPreviewView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                }
+                resultPreviewView.frame = previewInnerFrame
+            } else if let resultPreviewView = self.resultPreviewView {
+                self.resultPreviewView = nil
+                resultPreviewView.removeFromSuperview()
+            }
+            
+            if isFirstTime {
+                self.animateIn()
+            }
+        }
+    }
+
+    fileprivate var node: Node {
+        return self.displayNode as! Node
+    }
+
+    private let context: AccountContext
+    private let updatedPresentationData: (initial: PresentationData, signal: Signal<PresentationData, NoError>)?
+    private let inputPanelFrame: CGRect
+
+    fileprivate let completion: (EnqueueMessage) -> Void
+    
+    private var audioSessionDisposable: Disposable?
+    
+    private let hapticFeedback = HapticFeedback()
+    
+    private var validLayout: ContainerViewLayout?
+    
+    fileprivate var camera: Camera? {
+        return self.node.camera
+    }
+    
+    fileprivate var cameraState: CameraState {
+        return self.node.cameraState
+    }
+    
+    fileprivate func updateCameraState(_ f: (CameraState) -> CameraState, transition: Transition) {
+        self.node.cameraState = f(self.node.cameraState)
+        self.node.requestUpdateLayout(transition: transition)
+        self.durationValue.set(self.cameraState.duration)
+    }
+    
+    fileprivate func updatePreviewState(_ f: (PreviewState?) -> PreviewState?, transition: Transition) {
+        self.node.previewState = f(self.node.previewState)
+        self.node.requestUpdateLayout(transition: transition)
+    }
+    
+    public final class RecordingStatus {
+        public let micLevel: Signal<Float, NoError>
+        public let duration: Signal<TimeInterval, NoError>
+        
+        public init(micLevel: Signal<Float, NoError>, duration: Signal<TimeInterval, NoError>) {
+            self.micLevel = micLevel
+            self.duration = duration
+        }
+    }
+    
+    private let micLevelValue = ValuePromise<Float>(0.0)
+    private let durationValue = ValuePromise<TimeInterval>(0.0)
+    public let recordingStatus: RecordingStatus
+    
+    public var onDismiss: (Bool) -> Void = { _ in
+    }
+    
+    public var onStop: () -> Void = {
+    }
+    
+    public var onResume: () -> Void = {
+    }
+    
+    public struct RecordedVideoData {
+        public let duration: Double
+        public let frames: [UIImage]
+        public let framesUpdateTimestamp: Double
+        public let trimRange: Range<Double>?
+    }
+    
+    private var currentResults: Signal<[VideoMessageCameraScreen.CaptureResult], NoError> {
+        var results: Signal<[VideoMessageCameraScreen.CaptureResult], NoError> = .single(self.node.results)
+        if self.waitingForNextResult {
+            results = results
+            |> mapToSignal { initial in
+                return self.node.resultsPipe.signal()
+                |> take(1)
+                |> map { next in
+                    var updatedResults = initial
+                    updatedResults.append(next)
+                    return updatedResults
+                }
+            }
+        }
+        self.waitingForNextResult = false
+        return results
+    }
+        
+    public func takenRecordedData() -> Signal<RecordedVideoData?, NoError> {
+        let previewState = self.node.previewStatePromise.get()
+        return self.currentResults
+        |> take(1)
+        |> mapToSignal { results in
+            var totalDuration: Double = 0.0
+            for result in results {
+                if case let .video(video) = result {
+                    totalDuration += video.duration
+                }
+            }
+            let composition = composition(with: results)
+            return combineLatest(
+                queue: Queue.mainQueue(),
+                videoFrames(asset: composition, count: 12),
+                previewState
+            )
+            |> map { framesAndUpdateTimestamp, previewState in
+                return RecordedVideoData(
+                    duration: totalDuration,
+                    frames: framesAndUpdateTimestamp.0,
+                    framesUpdateTimestamp: framesAndUpdateTimestamp.1,
+                    trimRange: previewState?.trimRange
+                )
+            }
+        }
+    }
+    
+    public init(
+        context: AccountContext,
+        updatedPresentationData: (initial: PresentationData, signal: Signal<PresentationData, NoError>)?,
+        inputPanelFrame: CGRect,
+        completion: @escaping (EnqueueMessage) -> Void
+    ) {
+        self.context = context
+        self.updatedPresentationData = updatedPresentationData
+        self.inputPanelFrame = inputPanelFrame
+        self.completion = completion
+        
+        self.recordingStatus = RecordingStatus(micLevel: self.micLevelValue.get(), duration: self.durationValue.get())
+
+        super.init(navigationBarPresentationData: nil)
+
+        self.statusBar.statusBarStyle = .Ignore
+        self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait)
+        
+        self.navigationPresentation = .flatModal
+        
+        self.requestAudioSession()
+    }
+
+    required public init(coder: NSCoder) {
+        preconditionFailure()
+    }
+    
+    deinit {
+        self.audioSessionDisposable?.dispose()
+        if #available(iOS 13.0, *) {
+            try? AVAudioSession.sharedInstance().setAllowHapticsAndSystemSoundsDuringRecording(false)
+        }
+    }
+
+    override public func loadDisplayNode() {
+        self.displayNode = Node(controller: self)
+
+        super.displayNodeDidLoad()
+    }
+        
+    public func sendVideoRecording() {
+        if case .none = self.cameraState.recording {
+        } else {
+            self.waitingForNextResult = true
+            self.node.stopRecording.invoke(Void())
+        }
+        
+        let _ = (self.currentResults
+        |> take(1)
+        |> deliverOnMainQueue).startStandalone(next: { [weak self] results in
+            guard let self, let firstResult = results.first, case let .video(video) = firstResult else {
+                return
+            }
+
+            var videoPaths: [String] = []
+            var duration: Double = 0.0
+
+            for result in results {
+                if case let .video(video) = result {
+                    videoPaths.append(video.videoPath)
+                    duration += video.duration
+                }
+            }
+            
+            let finalDuration: Double
+            if let trimRange = self.node.previewState?.trimRange {
+                finalDuration = trimRange.upperBound - trimRange.lowerBound
+            } else {
+                finalDuration = duration
+            }
+            
+            var resourceAdjustments: VideoMediaResourceAdjustments? = nil
+            
+            let values = MediaEditorValues(peerId: self.context.account.peerId, originalDimensions: PixelDimensions(width: 400, height: 400), cropOffset: .zero, cropRect: CGRect(origin: .zero, size: CGSize(width: 400.0, height: 400.0)), cropScale: 1.0, cropRotation: 0.0, cropMirroring: false, cropOrientation: nil, gradientColors: nil, videoTrimRange: self.node.previewState?.trimRange, videoIsMuted: false, videoIsFullHd: false, videoIsMirrored: false, videoVolume: nil, additionalVideoPath: nil, additionalVideoIsDual: false, additionalVideoPosition: nil, additionalVideoScale: nil, additionalVideoRotation: nil, additionalVideoPositionChanges: [], additionalVideoTrimRange: nil, additionalVideoOffset: nil, additionalVideoVolume: nil, nightTheme: false, drawing: nil, entities: [], toolValues: [:], audioTrack: nil, audioTrackTrimRange: nil, audioTrackOffset: nil, audioTrackVolume: nil, audioTrackSamples: nil, qualityPreset: .videoMessage)
+            
+            if let valuesData = try? JSONEncoder().encode(values) {
+                let data = MemoryBuffer(data: valuesData)
+                let digest = MemoryBuffer(data: data.md5Digest())
+                resourceAdjustments = VideoMediaResourceAdjustments(data: data, digest: digest, isStory: false)
+            }
+ 
+            let resource: TelegramMediaResource
+            resource = LocalFileVideoMediaResource(randomId: Int64.random(in: Int64.min ... Int64.max), paths: videoPaths, adjustments: resourceAdjustments)
+            
+            var previewRepresentations: [TelegramMediaImageRepresentation] = []
+                        
+            let thumbnailResource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
+            let thumbnailSize = video.dimensions.cgSize.aspectFitted(CGSize(width: 320.0, height: 320.0))
+            let thumbnailImage = scaleImageToPixelSize(image: video.thumbnail, size: thumbnailSize)
+            if let thumbnailData = thumbnailImage?.jpegData(compressionQuality: 0.4) {
+                self.context.account.postbox.mediaBox.storeResourceData(thumbnailResource.id, data: thumbnailData)
+                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailSize), resource: thumbnailResource, progressiveSizes: [], immediateThumbnailData: nil, hasVideo: false, isPersonal: false))
+            }
+            
+            let tempFile = TempBox.shared.tempFile(fileName: "file")
+            defer {
+                TempBox.shared.dispose(tempFile)
+            }
+            if let data = compressImageToJPEG(video.thumbnail, quality: 0.7, tempFilePath: tempFile.path) {
+                context.account.postbox.mediaBox.storeCachedResourceRepresentation(resource, representation: CachedVideoFirstFrameRepresentation(), data: data)
+            }
+
+            let media = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: Int64.random(in: Int64.min ... Int64.max)), partialReference: nil, resource: resource, previewRepresentations: previewRepresentations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: nil, attributes: [.FileName(fileName: "video.mp4"), .Video(duration: finalDuration, size: video.dimensions, flags: [.instantRoundVideo], preloadSize: nil)])
+            
+            
+            var attributes: [MessageAttribute] = []
+            if self.cameraState.isViewOnceEnabled {
+                attributes.append(AutoremoveTimeoutMessageAttribute(timeout: viewOnceTimeout, countdownBeginTime: nil))
+            }
+    
+            self.completion(.message(
+                text: "",
+                attributes: attributes,
+                inlineStickers: [:],
+                mediaReference: .standalone(media: media),
+                threadId: nil,
+                replyToMessageId: nil,
+                replyToStoryId: nil,
+                localGroupingKey: nil,
+                correlationId: nil,
+                bubbleUpEmojiOrStickersets: []
+            ))
+        })
+    }
+    
+    private var waitingForNextResult = false
+    public func stopVideoRecording() -> Bool {
+        self.waitingForNextResult = true
+        self.node.stopRecording.invoke(Void())
+        
+        return true
+    }
+    
+    public func lockVideoRecording() {
+        self.updateCameraState({ $0.updatedRecording(.handsFree) }, transition: .spring(duration: 0.4))
+        
+        self.node.maybePresentViewOnceTooltip()
+    }
+    
+    public func discardVideo() {
+        self.requestDismiss(animated: true)
+    }
+    
+    public func extractVideoSnapshot() -> UIView? {
+        if let snapshotView = self.node.previewContainerView.snapshotView(afterScreenUpdates: false) {
+            snapshotView.frame = self.node.previewContainerView.convert(self.node.previewContainerView.bounds, to: nil)
+            return snapshotView
+        }
+        return nil
+    }
+
+    public func hideVideoSnapshot() {
+        self.node.previewContainerView.alpha = 0.02
+    }
+    
+    public func updateTrimRange(start: Double, end: Double, updatedEnd: Bool, apply: Bool) {
+        self.node.updateTrimRange(start: start, end: end, updatedEnd: updatedEnd, apply: apply)
+    }
+    
+    private func requestAudioSession() {
+        self.audioSessionDisposable = self.context.sharedContext.mediaManager.audioSession.push(audioSessionType: .recordWithOthers, activate: { _ in
+            if #available(iOS 13.0, *) {
+                try? AVAudioSession.sharedInstance().setAllowHapticsAndSystemSoundsDuringRecording(true)
+            }
+        }, deactivate: { _ in
+            return .single(Void())
+        })
+    }
+            
+    private var isDismissed = false
+    fileprivate func requestDismiss(animated: Bool) {
+        guard !self.isDismissed else {
+            return
+        }
+        
+        self.node.dismissAllTooltips()
+        
+        self.node.camera?.stopCapture(invalidate: true)
+        self.isDismissed = true
+        if animated {
+            self.node.animateOut(completion: {
+                self.dismiss(animated: false)
+            })
+        } else {
+            self.dismiss(animated: false)
+        }
+    }
+        
+    override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        self.validLayout = layout
+        
+        super.containerLayoutUpdated(layout, transition: transition)
+
+        if !self.isDismissed {
+            (self.displayNode as! Node).containerLayoutUpdated(layout: layout, transition: Transition(transition))
+        }
+    }
+}
+
+private func composition(with results: [VideoMessageCameraScreen.CaptureResult]) -> AVComposition {
+    let composition = AVMutableComposition()
+    var currentTime = CMTime.zero
+    
+    for result in results {
+        guard case let .video(video) = result else {
+            continue
+        }
+        let asset = AVAsset(url: URL(fileURLWithPath: video.videoPath))
+        let duration = asset.duration
+        do {
+            try composition.insertTimeRange(
+                CMTimeRangeMake(start: .zero, duration: duration),
+                of: asset,
+                at: currentTime
+            )
+            currentTime = CMTimeAdd(currentTime, duration)
+        } catch {
+        }
+    }
+    return composition
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Camera/VideoMessageFlip.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Camera/VideoMessageFlip.imageset/Contents.json
new file mode 100644
index 0000000000..c55a51057a
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Camera/VideoMessageFlip.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "switchcamera_30.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Camera/VideoMessageFlip.imageset/switchcamera_30.pdf b/submodules/TelegramUI/Images.xcassets/Camera/VideoMessageFlip.imageset/switchcamera_30.pdf
new file mode 100644
index 0000000000..aa86094918
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Camera/VideoMessageFlip.imageset/switchcamera_30.pdf
@@ -0,0 +1,188 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 3.084961 5.584656 cm
+0.000000 0.000000 0.000000 scn
+9.490515 20.080341 m
+9.422689 20.080362 l
+8.999260 20.080563 8.679590 20.080715 8.371326 20.006708 c
+8.099400 19.941423 7.839443 19.833746 7.600999 19.687628 c
+7.330693 19.521984 7.104758 19.295835 6.805490 18.996283 c
+6.757546 18.948309 l
+5.959852 18.150616 l
+5.772345 17.963108 5.716480 17.908821 5.660614 17.864992 c
+5.468593 17.714350 5.238950 17.619228 4.996650 17.589970 c
+4.926156 17.581457 4.848266 17.580341 4.583089 17.580341 c
+4.484859 17.580357 l
+3.725908 17.580544 3.223788 17.580666 2.792615 17.474993 c
+1.466152 17.149897 0.430476 16.114222 0.105380 14.787757 c
+-0.000294 14.356585 -0.000171 13.854465 0.000015 13.095512 c
+0.000031 12.997284 l
+0.000031 5.465342 l
+0.000031 5.436520 l
+0.000025 4.620880 0.000020 3.968216 0.043112 3.440796 c
+0.087345 2.899416 0.180274 2.431705 0.399492 2.001467 c
+0.750868 1.311853 1.311542 0.751179 2.001156 0.399803 c
+2.431395 0.180586 2.899104 0.087656 3.440485 0.043423 c
+3.967894 0.000332 4.620543 0.000336 5.436161 0.000341 c
+5.436225 0.000341 l
+5.465031 0.000341 l
+18.365032 0.000341 l
+18.393837 0.000341 l
+18.393900 0.000341 l
+19.209520 0.000336 19.862169 0.000332 20.389578 0.043423 c
+20.930958 0.087656 21.398668 0.180586 21.828907 0.399803 c
+22.518520 0.751179 23.079195 1.311853 23.430571 2.001467 c
+23.649788 2.431705 23.742718 2.899416 23.786951 3.440796 c
+23.830042 3.968204 23.830038 4.620852 23.830032 5.436470 c
+23.830032 5.436536 l
+23.830032 5.465342 l
+23.830032 12.997283 l
+23.830048 13.095503 l
+23.830235 13.854461 23.830357 14.356583 23.724682 14.787757 c
+23.399588 16.114222 22.363911 17.149897 21.037447 17.474993 c
+20.606276 17.580666 20.104155 17.580544 19.345201 17.580357 c
+19.246973 17.580341 l
+18.981796 17.580341 18.903906 17.581457 18.833412 17.589970 c
+18.591112 17.619228 18.361469 17.714350 18.169449 17.864992 c
+18.113583 17.908821 18.057718 17.963108 17.870209 18.150616 c
+17.072515 18.948311 l
+17.024576 18.996279 l
+16.725307 19.295834 16.499371 19.521982 16.229063 19.687628 c
+15.990620 19.833746 15.730661 19.941423 15.458736 20.006708 c
+15.150473 20.080715 14.830803 20.080563 14.407373 20.080362 c
+14.339548 20.080341 l
+9.490515 20.080341 l
+h
+8.681808 18.713455 m
+8.817650 18.746067 8.969681 18.750341 9.490515 18.750341 c
+14.339548 18.750341 l
+14.860382 18.750341 15.012413 18.746067 15.148252 18.713455 c
+15.284472 18.680752 15.414694 18.626812 15.534140 18.553616 c
+15.653254 18.480623 15.763777 18.376143 16.132063 18.007858 c
+16.929756 17.210163 l
+16.954220 17.185692 l
+16.954237 17.185675 l
+17.106804 17.033035 17.221756 16.918030 17.348524 16.818577 c
+17.731848 16.517857 18.190273 16.327971 18.673967 16.269562 c
+18.833941 16.250244 18.996555 16.250284 19.212389 16.250336 c
+19.246973 16.250341 l
+20.139725 16.250341 20.466656 16.245523 20.720854 16.183224 c
+21.565954 15.976102 22.225792 15.316265 22.432913 14.471165 c
+22.495213 14.216966 22.500031 13.890034 22.500031 12.997283 c
+22.500031 5.465342 l
+22.500031 4.614289 22.499514 4.015995 22.461367 3.549101 c
+22.423855 3.089968 22.353294 2.816771 22.245531 2.605274 c
+22.021667 2.165916 21.664457 1.808706 21.225100 1.584843 c
+21.013603 1.477079 20.740406 1.406519 20.281273 1.369007 c
+19.814379 1.330860 19.216084 1.330343 18.365032 1.330343 c
+5.465031 1.330343 l
+4.613979 1.330343 4.015684 1.330860 3.548789 1.369007 c
+3.089657 1.406519 2.816460 1.477079 2.604963 1.584843 c
+2.165605 1.808706 1.808395 2.165916 1.584531 2.605274 c
+1.476768 2.816771 1.406208 3.089968 1.368695 3.549101 c
+1.330548 4.015995 1.330031 4.614290 1.330031 5.465342 c
+1.330031 12.997284 l
+1.330031 13.890034 1.334849 14.216966 1.397150 14.471165 c
+1.604271 15.316265 2.264108 15.976102 3.109208 16.183224 c
+3.363407 16.245523 3.690338 16.250341 4.583089 16.250341 c
+4.617674 16.250336 l
+4.617689 16.250336 l
+4.833515 16.250284 4.996125 16.250244 5.156096 16.269562 c
+5.639788 16.327971 6.098214 16.517857 6.481537 16.818577 c
+6.608315 16.918037 6.723272 17.033049 6.875851 17.185703 c
+6.900304 17.210163 l
+7.697999 18.007858 l
+8.066284 18.376143 8.176808 18.480623 8.295923 18.553616 c
+8.415368 18.626812 8.545589 18.680752 8.681808 18.713455 c
+h
+8.819138 12.449797 m
+9.606685 13.253181 10.702194 13.750379 11.915030 13.750379 c
+13.964883 13.750379 15.683014 12.327185 16.134258 10.415339 c
+14.848875 10.415339 l
+14.636918 10.415339 14.521129 10.168130 14.656816 10.005297 c
+16.622980 7.645809 l
+16.722927 7.525869 16.907139 7.525866 17.007090 7.645802 c
+18.973408 10.005290 l
+19.109104 10.168120 18.993317 10.415339 18.781355 10.415339 c
+17.491955 10.415339 l
+17.019377 13.067384 14.702655 15.080379 11.915030 15.080379 c
+10.330412 15.080379 8.896755 14.428887 7.869370 13.380838 c
+7.612269 13.118567 7.616461 12.697534 7.878733 12.440434 c
+8.141004 12.183333 8.562037 12.187525 8.819138 12.449797 c
+h
+6.338119 8.415344 m
+5.048842 8.415344 l
+4.836884 8.415344 4.721095 8.662557 4.856786 8.825389 c
+6.822981 11.184870 l
+6.922931 11.304811 7.107148 11.304810 7.207097 11.184867 c
+9.173254 8.825387 l
+9.308942 8.662554 9.193151 8.415344 8.981194 8.415344 c
+7.695821 8.415344 l
+8.147092 6.503536 9.865205 5.080379 11.915030 5.080379 c
+13.096758 5.080379 14.166923 5.552347 14.949532 6.319569 c
+15.211796 6.576675 15.632830 6.572495 15.889937 6.310231 c
+16.147045 6.047967 16.142864 5.626933 15.880600 5.369825 c
+14.859452 4.368757 13.458792 3.750378 11.915030 3.750378 c
+9.127432 3.750378 6.810725 5.763336 6.338119 8.415344 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  5480
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 30.000000 30.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000005570 00000 n
+0000005593 00000 n
+0000005766 00000 n
+0000005840 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+5899
+%%EOF
\ No newline at end of file
diff --git a/submodules/TelegramUI/Resources/Animations/PremiumPrivacyPresence.tgs b/submodules/TelegramUI/Resources/Animations/PremiumPrivacyPresence.tgs
new file mode 100644
index 0000000000000000000000000000000000000000..9e8554d61a453a716bf422a20f74b9cedca0ea89
GIT binary patch
literal 4940
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
KhLMtma{vHgMu#Z?

literal 0
HcmV?d00001

diff --git a/submodules/TelegramUI/Resources/Animations/PremiumPrivacyRead.tgs b/submodules/TelegramUI/Resources/Animations/PremiumPrivacyRead.tgs
new file mode 100644
index 0000000000000000000000000000000000000000..91c207c6cb8f679d748815a4b91505a035146498
GIT binary patch
literal 9566
zcmaKQb8u$Sw`Iq+zMx|}Uu-+wv2Av2^NVe>W81cEbnK3ep8V$hG4rbCP1Rks&s}$&
zU3Kr>ReSA26bTFaaFlBL4Z_jX&_u=Zmnox_lb!9iOMWD`&E|MNQ+YS_Dm@YbaLDJ~
z#;)U;)n5cu4hb9%AGd1r<7)JlOH1o9Ob>oN=_Jqx2|95K7WxU2EqxZ!_RP<Ch|sJ-
zxlh{{TkEXxD)E~bUM1&U+LrW>)76i*U>aa?-0wH8S1Iu_7hR3lx8U8cR&87_uNOve
zJK0%TvoMk8=Z8n0SIZ5@Mpxc9wr#^bey%k$j9@Z#EgmgyvfA`+`i!yqx-*ytZF&nE
z>eq8KUUYKU_iJ?S1pCK=eMGlitJ-#5`<yJDZR?(Qa_K66{BG`mC~>~XG$uMW=1Jjb
z&qU@)jQcKR#(H9wq=3P9VJktQMY?gH4@ZY4`t#U_Ew4HdZO*R~Fm^E=4oH(tr;zS-
zMr22kPji-eahjxND}Ik4d1O-pT+_k)#dsOa&L)%#yHU4Jw{vF)-!5-E{Qa)WKql<W
zRMv~nNZDtXx9#k=2D{Xe%q7o9%yVYmET4A0uI@lYCV2vQ?TYg$LXvGOGU0y>42hjM
z9X!fCCHbm;$zsLc=6|+c9M(()(Yf05bi{5KraT|4)_&ZVoDVHcG#C?iOfE@39U0ZE
zwbY$MNj+`TFE{+-X@55CdO65VEvaFO<utFDSbG@rc42;d$xUT_4%Pf==9hDcqrUU&
zU?R8spALVQ+tcM<q#fs&{tDIEocWr0i{HEBzeL(MZnGM}XEZ_s7AkYQqly!6j~Amm
zrO8EMh6#jGM<e|uLZ)2@oi`t?Hy`*Z=8;gQQxbo{{x`uX-(bOi&ywn3pZ9x-mpiG^
zJ2l@XXxn{#oVzq<;@2Zrj-4pNuFqF+obsOU|Kv$<eDd;UPwk49Uip0<f2zel*Pt9?
zTd^dD>8;Euv;W#R9A1#PdA>s5)@N8=nUGA)e4*=2;BeB>K*XuQ&_0L{N;PT@R+2B+
zPmO%oS{l23G@JGasKkMhQnr$t?|*$fTzhfk=<&yn)n>23i44}i5W4MteerD$uG<j1
zN3(+Iyh~lKf)MXATgp9dx|)WX-fEb@nLG7#aad8}>ftIa?1$?mTiVlP;;dOoZE$jj
zmrt?7KE5+&Hhsb=@u-ab`Lh8doATB<9cN<SCjKPxUBe11bAMr|j-%vg5K}fgE9dCN
zGHdMjIBS>A(Fj8JXyK4_^?V4ACU#rG_0j#k)RBkMU_JBgi3U>)D_P=xp$!QRRip@&
z<izBlthZG?rZ2-2N{(P;F45x4*yRg9OGm?y;&iRn#E_>)*UQH3*88?FWW~^J$-3M>
zOvlbZb#s_G=w<zraIXfzcQAqXg^Sw<C~s%}H=>m!b1o0F7Bh2p$R~W*&s+21>(q4T
z9YPo1w^`q}Q(?%dH&0D3mzD1J9p8s<dP~FOW-iu`3MxHyseY~O9du`!3eBxUrX<<T
z6%1MjOm1fXz@i^s-@UEL1;RM!s8RYFcxMF5dh!BKzJI88Z4(NijDsDtpKiUgvIOP4
zV)DpN3g9$I8a>)qtaO7H#TtH(uKw4wJxR3m@)WebBX8v=SpD%q;r+QrwGs43uh3Gk
zO7)%Oanbd+^+M<iP5;DU<cnz9xc>K~NvvEy3aiFtT!?P(Fjcac4)%>4u6N18eY-nO
zZApzzdmVw`cn0msBNnF?U5fDtQd;K@k*gM-oDy+@p?S0VtiQ6<@6&3#`pX%wvMe3?
zBN6W1{!cA8Q^!-BenFgm**jRQX_`+%7YKlSZCT3BPi^O$%Uf?3?`98mFQ=96vL6+f
zXkMx6zJ&FD*-SBmHg%W{HA5F2%L)JZiQn6WxAt0>N1h+te!SvD4hQ*p&!08K<n(9l
zEIJS&P~EeIj$jbKK7XSTMEwil{%p|k1h`ztc*pcF53sB|N#oyHWpQcp<Sh~WtG*9c
z>n%@5F6e$X_MSJnNq<koYgWndHYP0f!p=kZEO3$cTf3dw3uCaw)ooAkVtVL?>JmrZ
zx~YFoJu`n6cZy@x%DWoI_jO8b!PoCk1x5pjiSSO#Mq5qQ2z9-;vH&g@Z3eZLl9GAL
zb*p~X#o0ISw<n3ny^C+Q&(A^^HX)%D2*+>>8;aYWE)2*!M9xXwTy+f2o$anDM4T{B
zJLw&{x*V)fPme}(Cl#Shfx~4gtgIYwdj|$?6zhk*kv&8gwiz*V^EAr)8qe6`HBU_!
zJL@h*0*W|DX8(RQ!3#I@q_&(-wJgy>{yYAly0|dj47ycQ$9uwXqZ|L=3DgJqRa$JR
zKCaNcnqJi8o~REC{tJ;h2fv4cpEcJmSk=u8_1m$dM{_Na{`EFg7*u@Vzh>akt=+^z
z+O`l-1n2Vov<qTTF%j8jVCm>?Xz$fi`=o0-D?3Mz@#aSJ@@8yr51vD`#mtQst(7rH
zPnnF36P>f-sq4~n=TgWK#(IgcA^Pm9x}_&YpCRw(Ed7?MPXOKO*0ksH67<_!99_9F
zWQK1RC*cyEryUixBxBz5j>m_alRsZrt*nE5U`J`Bgu_Owfwt-nAj<{wpI5+J3zPhE
zMML7+`ze;~8Byi($V8Cer&E{U+rG`e+PRyz!;|%qCs>s8ebb$3`lpoL%ZiFSiudQE
zxt(c_h8ND*@d5)BxKo_ShdrY<&FcI$#fq253+KD3!nOAc^c>x)>HI$vIEOGWs&$9=
zgG8o1p5dOg>~dBwo0|+yYq=aK=5Jq(c6(9=-pm6B&W%TEm7b}_@TWcKJ7iY%jK!IK
z^DlUt;(aG~PiqOD`H$gAervhDf7$Bq*uMu^lhEZ`ip1Uy1@50$VhQ=4-#-^h1o^!0
zPX~fNtkzav-#ee~MxL(tUyp8nLZ)`X3V7W<W$P0?_<me|)O4SV^m#ntN8cN(lU2E5
zI$b^PGZFfHo}%b)eZJ0NSd|j}<$F20>)5#@e_kS%GtGS1eYHeoEcGHP@Iw;0e@XoA
z?#g~R;h`<;O4Y7aQ=M`?#mkeCMkMs&_x0M<GuMgB6N2ygk3(cCC5pZ#3Yiakx3A7k
z-C<h#g5{@Mu9G4AeT}+AOw*~HWHxULU@8npG1Qs+V{@?+`$&7Ml^j>qDRX9~Se5>7
z-apUUA(WN{wH23fzr!cz^4mR*Izql5T1!O#Y5_HGR7&>*2=4UGoO3(!E3#<!z2Em9
zwS$L2ph~Tug{^GBk0ivS*Z<@$qRkUMtM{|1Agamp$GKZEdW4o<+pfInLk$<jiOfB!
zOZ%mlqw5EfESOt6#G%vhNSh#isBHdVrS1IuuzP-HVx6Dt-}wz{e*8FlC>B$wAx=<M
zZ+ER&wAabj6>RU^re};zmH%m1vl8jn?54HhE%s7bEpS-=tF>|ie{pVlf4L2jNU)0`
zHg|jaQ^mKpM5Cc4TA5n?sG((MH`C2&6-VG>H+n0uSJa{x7y>?Y!NBIFf{$s}e8@Ai
zUFxLlv!rN(81hR!0YTE|?$0e91KB&#gr;$>@8|2DMOzM8ca1uV0$1Dc&D##EDssR-
zumsz-&p|zH<3fF(`X{{$h7J^E)$=U&YGebZ6P-lgHH^iY6>}W6v6>EfMWU?iAbU36
zEW_cyWGZ~Kwgjy>;^Yk~QbD29Gj#oUBbN>?v)c}X$n53F%Za+jAE$qv4iV$K&t75W
zvubd3?Iyiem{YF)cKO*7p|up7wRaX^^ED4cK1!_<;=5&uUGZ=b4FL>NrG*BViCN;u
zi@1{FC!O3qs1v15<w{8-FpyBVf_$z6=%I=+p70Q|e{PmwJe>~u@HpiDKbKD~i_Uuj
z*{w5Q^8b(Qzcx#(_2gi<v9E`}*)6ZN4=4$p@d0raa!leAdN{Sg4x6wPf^492QXK&E
zp2W}qu&@Jn(ZWatBRV@M4TTLbZ2$er?VmSTpfr^e((yga&muwixBFRs0Ts$|RYqhA
zAx*A@NZqxT94cC1oh`t8u%Nf)tE)MT!=B6;UasZ;EEFjrl`Z7^`ALMx<~zbyn+Z|C
zKEv(%%)(`8R9XV|Io)b-OIMc`u}6;PP~><?U!;<R%YeL3t%yz}!Ts60HpGo=n$&wh
zVQ}q6U<w@20j8)j3Rydn6!KYW7$vt3ktD0^CBh#$kz=&!!q!UAM~pI~)3Dc%2bMx5
zi{Kg+XeAFNL+jDT8s$~`AL@{OgoZ~&=)fzBwJY2c2dSqsGtb^8uo~I`DCFS3AqY(R
zuXCY!;8|K;K&V<Mep})hfUzW`5GR4hLMzjdA`~sF^|mf2O342c0P;>ZRch@xIZ!+^
z<2wUS?-w6ahh5u0d>wK`mCVn|mXe=&(}>vScar1YIN&JsSDJZSg*?KYB)=t)h(#l&
z5!X8Gc!6ZZ@-P!iS-JfHX@EZcFtZY>M^$=U+oV%)!<RmyT$4s8!nWElyM0DPU%A~Z
z(v^$TOMi1vF%wdwIi^Ir{vz6S?~`~Fq8N)+OL(=QpdhLu|Co~j5>*x57bYid<&i)0
zN=BuDQqy)y2O*dJf!{Sq>7T=bl(Zck8rtzF#+~iQpyp+0X6z^Agf@lwOnI^(*JTxX
zk|4v04EiB82+8(Kh03D)uGR7+0Nc<?^B8jJkQ3hI^s~_IbAjK`fu7)}2Be6tkiX@E
z4`qpQWKJLuMB2ew%myU$=U45MfN&{>>3riP9Z)2fakB@q(DDN4c{bx>8hW7qYUunj
zNa1W@F%vMc*`RgzS~=vRC%|w46p3!Um11!aFN7OO8Z%tVn{*i&>I*JpW8g4o$k|<e
zc2cFO%o3N>8O0g=+8#u5k=A-+Ps%JvDHnJcrDQ!C8qdmrcoG%GLxymI_!_8`@-t1g
zxK$d$Y~)%LXq`@Ns7x8;VVWUM!{~r0$`hP(09IMvSBvE|Q5go`du1S$I!l_3q+evX
zLl^QRJt{ce6%AKqi5bx%GO3*$=@i{FL8VhfGlwQXmK;w4av+Y8Ml2oK7Rf3~OB+C0
zKnxWgL{eeV7KLmVNiLitPLpW(QXG*e)rSHCGr?pL=yQISk&&0Hk_A$VN<u?34xj?z
zFVN*e6AT?~kYv)Mvc{Md<BhG8nEeq&xfTM%2nt-a;1LLLp%UXo%niPHllJ+80cZOX
z1x}^$j_THJyfy;>o315`G=y4Wu)DevOO2SCaiKrU0CN$07>o&+NQ}~Ruo9)HDy#U2
z3^QUvQxWyTE&^W_Rk@aYLhzVEJY%i041oOC?*ciPMB#q4-*O-`pg|)(4FDRhr;U1{
zFWX24%l20o4`YTTG!zwxL<z?w0{IlvQ;7(lCNW-^PACKba)z&>*6gj0az#l3;?f6T
zQ_9qN;ex{Y8oA{lusJ+MzJ%)M*70!AB)TFxqM`Okij;C9it)q@NWi!-$3(n(*{L$o
z+j3F1iM)_t7re1rX0gAdb=K}~sB1|;w6BB?Nqe`W%wnjNF)Z$y1Kq?i@hSwO6%mLb
z891P?ocKk220<#bM@6My&6qOCDjN<)bXhHf3@kwcJ#iCDJpp8f%NF|G3%N6N7iP&I
z?p0`c5oTS*q=@Sj7dlS3Djud0G(R}(!mjJ06(11U2nE(pbV?raEhL9>?Cax^R)i@4
z(U6fTAmjy{(2q)~LgD>2ZGxd<k~&Gn%}iTR5!37M2N8+Bvs_+Nn*t;7a6Q&YAt8<;
z$hlRZE32VyZVT|fQ&zjk(E@^Pk}Sg2!NeLdV<eVArSu)-a2xrXVuw;xTg7|$5~?N^
zD&@@YaWW%E&g|0B*8Vyde@0Y!Gw@KRWN7P|Ni7_vAk<ch*XI_W&GnLu6aR#&@+B~m
zRB=R6R$(`-uKNsG&We2(eX*#IK-4iMK*Ys)e=k0hOjH*u?bP|B`ePTQ8IgfVEXxCD
zlybcAL##)7f0c$&$@D~ENIYYY^oK)yajTTFP7w{`JSL81L?qk)MR&*im%{9Sc>dpM
ztE3N-J<`i-;by9>@5j5|(6;j3Ya^}ul|IbK+~COU;4vnU1fGxtW{?D@uw3<M_6KBt
zsD}Z@g@}tR66FNOrQ<BaU!ivVa}G~3gwVg#Z#3cU-d5~{c53u>gz@#&BOVJBe?uGt
zOn*i_vOE)}#u$RV4C4?I`TLt$nh!QPVe(^D3k{-GiYdJOI$p!j8G19GCJCpo1<Q0?
zxBt^WJj&?u*YM<Xh9a(HVKyXB9e+=z#ATK9FzjXUtT?9my1u0y>->mIYzJG6(!bTQ
z`AzjxN0X(jV_^7W`KOHe_S`7!rOMbmwc4l5agJt`M0?cSbgGVI*^SX;=TxbqgvBv}
zCy;y_PFd<7;(@OrXM>0_BCO!>R#lpW1aFjUKjz7ymF=KnA(vUoK#cyDTGRkVh6w?i
zCjpxo0oy5;MZLr9!G0c%gz$crpDzg>H*$u9L>-|y=J|gQ!i4}pl6kz5il_vTK6JQc
zTQwmI7g(Tpe_Q>79+-xg8smk{d*w;cFxfke=Fbw%?@jdiSp6eh`*L*wjQNZZ51~fK
zSYz9y1j_kIejXp;Ofi8MFM6OfN*$i2Vm2DBkYu>pdLI6_zS1o`lEbbiWd+H7^-Y`l
zWOWfV$DL%9nthGtqw%@be$)#LNIjd;CFg%%0vTC2l*b`s9)^y3X<0Z{nqN1U#o1Xn
z&1<6voeKDMiFf@6oy^=!a?=QjcOvq3^8bnd7xh0bQ6r51cS>(AfrPt$A^f+m3NbL=
z5wu|e)ZXHqbK!dt_V{o-YF;#TG6INp6qn46a^Fr86QaXcr}D$<i$(~xtz}JgLUf-$
z1t7d?e7feR%ZTx<^mD272JDyay`<{(qSA2+tp|-teSA`0={J&CL9wA3E63~Szw_KT
zYj;F5M6y4QyanEbPUTjX6wY7i@6_5HX{10}D{seohcW%OD1ha3yuIS1hiWvB`Y1Eq
z8ruC{w94}(E{O&!f(1MFm{T|4f8pt%mzkSc4jD1ZY?hkPOjpo^9Hph2=wQ;{I@|5R
z1jAN$f8KZEq4HYVL3$FQv)ZQht@8ZCF%=`x*>s@F>;1TsjrMZA*6iPwvF=rJrOR36
zxpC;6wXWaE(-<Aovq4t!anNm59yQ0a7I2!EkI3`lob}XYnmVgS^6(|^waB%nBebyY
z=mphFJX4@8The6ej%2K>Ym2O<Lq<JO;)yF8IcdW>24%QM{pO9oRid&OQFd*^76q5b
zfe*#eOQEoh|J{rU<-~p^jwe<QI%yz9c5Eke0CdY^Q!0#%uTe(#Y6e9tE}=<#8zZYr
zKr+Z7z)jP|HJT}!x=pa2;N;b%*Cl=x>M~VhEU7G|Y26c#854e6JJClwq8}!X)CWGf
z)<9=EXZNjm*NTE4c0-{n!O#Zp3UF6{ZWuu^QI*IQYZB|GcP4(aN~bTX4Y*&rO*mOX
zwTHO%sV}>|O1`nH3G6jIs4!$_Gm_VUtnnpw$@sm_P~#!r0;s_>(-0-z%3h(-YrFid
z^j2}Xs7n8FPA}uBHlO2;O3z=Lp)7;?lt{=aso#}dIT|rdAN#Ib*o8?+KhRLX`lE97
zXbsanlf}-8$MDAlhM&F{gj}hbGfuihdXILLAf$xyLV92K5R==HFI1Yc;0BFTnnb%K
z3+|iNoC|_A4@&;DrM?h0Q*`prsp&LPtS9N5kW{I|r1i>6J{4!UN}S(rZl>k6EO3RB
zWQRN8cr!^fb{%F}?fvPG79L&rr;bpi6@0S54`H98orcXaQ)LObpix0kl6p){(wycJ
zf4zCop{{k21BsKPMA<m|{J?0Ju~Y}kpt9tVYtWu%PiOW%hgf(fAFgwHZkefG5-tjf
zT4KSSZN`Jx<Bct(@?Sf(^gRljcF9*<_l&-?g#kWV&s7C^8zObPOF-s5Q~2kJ7OhkE
z04oeO!M}R`Yc4W}yJ3#5lKE|6y;hmK&H!=k7mCJBx++XYtvCdl6e+>*?I7m#>qWB%
zx)>y;5MOW#jFbCXMJrDuD)$wpDad*W?A2hucFb)(S5oo{Gu5Q$5FJf-HK@Gd)@Ya=
zM<QIoSg9_n#MQC}4fP6A-Dh6z$DiG+P5BP6F0ru8Qs4$YRS}*NO`No0jw0~Z)>xHI
zpJjaZ`@8+~y?ocP{W;O03siSBP*Q+T@pki#-N#hhoFtNU-<#rrtrvuI*Vul?)s&#6
zMh9G|tKv5#J*6ntMP~kZXc${A4e>~k(w=_)x9DO}ifz#ot96Z70w;T8U3BboWD9;}
z9+cUfQ{dGh8)GNRgaKA}hVSESb@WV?0G;oS5-)9OegQ&mHtpX|<x5yq)aP7ff%d4%
zz|DM;^X?F?Vz2gnf4cgL<L19MxD<PN_<pAx#&V(h(?2+cC(bA>#-JruiB0hwAsPzs
z(^PwrCRy}+<Y;8aQ<QtBcm7muQoyzqWL4`UxAqchB-GMOd{5aoXV!-|6rSChkV!hd
zej5viR-Wrs<YkR}Dyk(uk@>6g#X3k8l2mOW*kZvpCZb_O>c;7X0l)JRBE}HQFd%uy
zC4Ivm4S^zhv~m=eS79g0{t*bGfRzLv*ky<>E|3e|`SCM#sAS3XhMuEWKt15ksln*d
z0UM=rZ<>YfkLh{|BOyYW;2<!SgTa#9Zvx45hRR3E^!Wg+-`top%z3gFfhJ%WVy6G`
zr30tttkeP+$k2_Td@9O6Ij;S}G>Lt3tP9ky2r!~N;*r4bauUKOnCw6el&pa?f1ki0
zuxzE-GfhMy{PJGgqNFhcYjgu_xY1!`5dH7Qup+QXDG>~cGD`UKEYo-iOT?;PX8)+b
z<#?lKo&pO7<))@6tR-5|C77HFNZ2N5bar4&N(wVSY3z?K=JijA0~SQ$!r5oYFWW1k
zoTWq=G!t)xVF?9Z5F+eNhGxnWg@~!@L`H8Pe0`&wg^ptm5R#IigDf6^p}CnW+AAz~
zHB&wKGUPxWBYNnCUGP*)4pX3sIEW?O0MIzSP@Vu)Nt=;#5|Q0dOaxORQ}iFDMVuK}
zkO~F)EqU_jKnVn`1O<Yt3|tVog3+<`H(vF@Y1N_W7oh+yXrwuGUjvfHHe98cSZoEp
zC?JSr9tTbzOo_UR=F2;db90z5Gw0I*K=z8B=>6R)j5gyYCQBJc5h7fGd5VxP+pm+9
zvp7g-PNrv}QBlWEkGNaVI13}Et_rV@g(luKDe49bBibIkE&|giE>cNXrjgp9z+{jR
z7<^_Bb|HRlO<1ctc`B{f1ZuEnBELol7$ZWolT$4x!_+eB%#MHk3F*e(Og<rRBLFGt
z0%!`-W)*$Cm69EpMXuF54w?3!F@eGQ<=PZ!wXv2aF`o{oz~;<s;zEIphhnY=N8^%^
zp){iTe9XO$00$#@k`w)y@ik3Yih~$sfX;wBS}EP&Q~T<8giIi=rZ{Lk%HEzD7br6H
z6Ekm%26%xklOEPd8mIz?2vJP;z*;Oi7A6h%RZEJCW2lHC95RFL^WT;!EEN+~LtB-(
zFJQ|;f=D7Hts=ku&L#bt?@Sbqb-{+H>Ms(=Z9)_1GAe1sdPv8E!xh*`6_CvV^}UHF
zsZe3QY|0giyL`NP_6dyukj1A31Kg|?b;7Xf4?H(L5(V#K$RJdbw3H`u1CJ8qqNMQB
zn`uXiu^{yXdn6Ny0n&=-NW3fhI0V-BR$3`H78pj8QWS${2bZ|NkXRAwgDv#$tuj(>
zf8mFyifxbrNsR0%$M2867%hY$>kB;)kviPzw0pignJf_2SBIiVksTPJbk7>#g`w18
zN@CR#$n(3@Mdk<ikDCLK;pn;yD}_OSb8=iUWk9jV8V#giDSE=eAFCXIGFp6@7#E<Q
zU5cb4l<8VJ!Z=)slB_B|APoRLnoB+cWf3C1TqgEic|SM(5TFSdDa}Dq7o=tQD*FQ$
z5y#y;iXzuVz3%#{A@jPKs+MSeT9~3pRS(-}b>~0k`&+^Vb2xM%f~T?l0{qUgbJwiu
zZCpv;On3j%t|j}Ndjx_M+Z{5c>EXS#^E`h2pHm|6<vMz(aN-wg&Wxyo@;d~6zYzyf
z!h;ZkA%R4S?IFZo%!~4cV?KhT@}TM5&pb549G(zp=<}8o1gAxs)ej>A!EA!7(c2B9
z(6&<(ydzin))Z#W@Au@l+5sTXQ$XV#!H`}IigQ!I<!h+`k2HAG<N7b?_7iHM6SoLh
zm-%?&?#E4U{F5Rw3ZA^}PUH2TJkVxwJAYO%Aj~TCpM`+)^Q`)vpV!H5Ap~U1IJt12
zK=Q)iID9ft79LsH7b3n8^@W%(#C;(l3(t6v(l~0>BnmAv3jM+UKY_(4@e?ibryb$;
zSlFv1!<rFN!fe9l+{SSuDMsidchz8sA1;Ecmg2D8>-VEZ^Z^M|l@hGR?>D?sAnvL^
zhQT=cwF@$v$LE-5je)RU1nL7>Y6|p!Z+5SDt+}g&lHZYG^Y!QeqO~J<f|J%1f3bdp
zcc~eaFqbdDZ=Y=Jn*)v-1D(t<aXTHg6#4OE6>5^_lO4oru-5kNa4wqA-v;1cXfAHG
z!awHHJrAxT`p2!sx2bPOQ&5`M(8H}{8f8pD@#<WQPGq!^dqCd`MNqpj;_mOE<HPQ^
zfe}1Xr+dt)`P_fqdx#W036c3M{V?TEPM3^<YQ2Th16kDJD1`)mc|Vh!2xOvEC}9Eb
z(e)w{GN&49ZE-9|BK@7#I$XMY*r6&);WLCwl#U&!WTn)k15!ncqqGPG*edX*Vc}M)
z*y`KHRgNZ*C+0?M^L}YkJQnN#P5HT?DCB`?k{png0X2kcc`@P~I0_K)F*S@}zy$Cn
zgr$XvUiITfI73oeF-$~Uj21f(x=|dP=Es95&>&IGVl-8A38+_a-7VWtX<Mw>EmUl;
zc#9?S=-%dAM=+>JZB8}6a3_#b;5I{`Jk8NIMV+^JC%_Tl0nG~6=orw|njl@I+MOw%
z7brLr)l1FBsGn`>{sHcBxa#wBU_vo;M}I`d*|_pH$UrryP6^Ykjx6O3`9k{JV{nuo
z&(d4;eruYUpX`!gY0~B_i$&^sk0yLJdUMP-YS_+IEck8@$R8lvY;*7`4Es3&!n|)c
zM(SzL%iOH#W6s$)Y!eChMJ}%XyZb}c#J5u!@sSoIYV96ja#8ILl?ubjIJ^TBEz>ep
zL}q?dtFK!rBip#3C>vSkJU$M$E2dZ<29Fp=RQ?DVCRgYZI}S=-jYm!@UNy&n6uKnE
z^P%ZK4^>X?=kRQK;-}K*QUfQYQU*5Yfcc_jovt1s*T-FO1{9j0?a1u9D{XA<0xyVV
zU<~QNyz3}1BAm$;G;GIS$}W6WLzJ206fpd~2{$d30-!*QpZSC%wY+t?kOVB~Ud7eu
zS<5rAT*8H_S}Xc(zszGpL-sc^JK#w>D}%nJqaV95V-YXLDS!Y2Ta3@57#-14DdSOB
zaZzis{a|@2%!(LF5=s*WjX;5XEyE3@X}#VTN2SNQml1_D{DO`hGrrE|nBgkM5l(2U
zA{hu#1YK@yp45!(L?#%lHpqc%-e{}Ml_zzUJ56mHO^UQ8(M;Ap#ucmN=uW(<Uqk|0
zz&)(89Kje-at3)1^v`yM_r}2)@zcM)0gJnBpn~bFQ`fbSsexp&rPIU?Q{5&^@QlE!
zh^Vmv-WGHneFjVEt0>YHbn8lK9-MU50jk12R*TCPvz3n_G(RiJ%z^Ou_+Ny5Bo%^d
zG{~sZSm`rO19Q9gCD(`)1f+^{v#0QiD_Z};Tblcq3>8h@%w<liTQsX~?)@Kfmq*l?
zc_WsEiswB;a~jtw$unJ`Tdl{wv8ieI{WZxFQe3Ts43z>~?sO1p&@#4QoWJ>wWy(ed
zhpgFH33mUD+aIqPivb0P4w%Qdi#iv9*Gw0z*I-Cv&YMMuO<~!IPT;h1<XzY{dM1!K
zuhkVSinol%f)WQ^YN(C&Qd?T&>@UnEHdydWXeGd?!4P2`x>4jYIaNC>+fApjIZ9=u
z8e>ka0p0Fbc8rm~4}&-yG^Ui&t^ccZx&HZeV<$lLqLXNU7=J{}_+ve^;;;+X==cHm
zM_-UwHdtX}o!w&7Ijtk@Pb5ul^0f-LoDo}u@6NPzJSgT9yqts66`XkD#rH*bz0Hav
zX*RDLp)H5W1V+bG1Po~D0G*WpTiNk^mUW&@20L0bUM6}=2GvF-D1^}_1TzKc?mM;E
zqav!`TE`ytPD-<cc|IIE+m9r!dan-q(sPT&i!~*RDg(m2Bd9Jir~S)(+QkzhgVl7R
zT6>H3rsI#kg|1CMXf1o4^*2|v9_-5H%C@``jZ`Z8x1;a-l4zQ&9hjTN;f7U;6;?Br
z$2gJ_W$~Cj%r{5Xg0@xCl{%EDI2)0VvV{?~tv~Ed;n^+DO$gL=G#NVw)I8B&U@%uz
ziWhAUXq3+S3KlSnDTKEEv#GXZbOIda*T!bzHeQ5lqZDTP-aN+a_mdSLO(ULrx&YpU
qe-8w=XR)s7hzIQ&mHG@TtMu0pHTfgPRZmy{P&#(ll7d*lzWpy~?0<0p

literal 0
HcmV?d00001

diff --git a/submodules/TelegramUI/Sources/ApplicationContext.swift b/submodules/TelegramUI/Sources/ApplicationContext.swift
index 5a1a4b9666..52f0de5dd3 100644
--- a/submodules/TelegramUI/Sources/ApplicationContext.swift
+++ b/submodules/TelegramUI/Sources/ApplicationContext.swift
@@ -29,6 +29,7 @@ import AuthorizationUI
 import ChatListUI
 import StoryContainerScreen
 import ChatMessageNotificationItem
+import PhoneNumberFormat
 
 final class UnauthorizedApplicationContext {
     let sharedContext: SharedAccountContextImpl
@@ -725,7 +726,7 @@ final class AuthorizedApplicationContext {
         })
        
         let importableContacts = self.context.sharedContext.contactDataManager?.importable() ?? .single([:])
-        self.context.account.importableContacts.set(self.context.account.postbox.preferencesView(keys: [PreferencesKeys.contactsSettings])
+        let optionalImportableContacts = self.context.account.postbox.preferencesView(keys: [PreferencesKeys.contactsSettings])
         |> mapToSignal { preferences -> Signal<[DeviceContactNormalizedPhoneNumber: ImportableDeviceContactData], NoError> in
             let settings: ContactsSettings = preferences.values[PreferencesKeys.contactsSettings]?.get(ContactsSettings.self) ?? .defaultSettings
             if settings.synchronizeContacts {
@@ -733,6 +734,11 @@ final class AuthorizedApplicationContext {
             } else {
                 return .single([:])
             }
+        }
+        self.context.account.importableContacts.set(optionalImportableContacts)
+        self.context.sharedContext.deviceContactPhoneNumbers.set(optionalImportableContacts
+        |> map { contacts in
+            return Set(contacts.keys.map { cleanPhoneNumber($0.rawValue) })
         })
         
         let previousTheme = Atomic<PresentationTheme?>(value: nil)
diff --git a/submodules/TelegramUI/Sources/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift
index 9ea110adfd..52caef14e8 100644
--- a/submodules/TelegramUI/Sources/ChatController.swift
+++ b/submodules/TelegramUI/Sources/ChatController.swift
@@ -120,6 +120,7 @@ import PeerInfoScreen
 import MediaEditorScreen
 import WallpaperGalleryScreen
 import WallpaperGridScreen
+import VideoMessageCameraScreen
 
 public enum ChatControllerPeekActions {
     case standard
@@ -347,8 +348,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
     var audioRecorderDisposable: Disposable?
     var audioRecorderStatusDisposable: Disposable?
     
-    var videoRecorderValue: InstantVideoController?
-    var videoRecorder = Promise<InstantVideoController?>()
+    var videoRecorderValue: VideoMessageCameraScreen?
+    var videoRecorder = Promise<VideoMessageCameraScreen?>()
     var videoRecorderDisposable: Disposable?
     
     var buttonKeyboardMessageDisposable: Disposable?
@@ -6295,7 +6296,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         $0.updatedInputTextPanelState { panelState in
                             if let videoRecorder = videoRecorder {
                                 if panelState.mediaRecordingState == nil {
-                                    return panelState.withUpdatedMediaRecordingState(.video(status: .recording(videoRecorder.audioStatus), isLocked: strongSelf.lockMediaRecordingRequestId == strongSelf.beginMediaRecordingRequestId))
+                                    let recordingStatus = videoRecorder.recordingStatus
+                                    return panelState.withUpdatedMediaRecordingState(.video(status: .recording(InstantVideoControllerRecordingStatus(micLevel: recordingStatus.micLevel, duration: recordingStatus.duration)), isLocked: strongSelf.lockMediaRecordingRequestId == strongSelf.beginMediaRecordingRequestId))
                                 }
                             } else {
                                 return panelState.withUpdatedMediaRecordingState(nil)
@@ -6325,13 +6327,13 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         strongSelf.present(videoRecorder, in: .window(.root))
                         
                         if strongSelf.lockMediaRecordingRequestId == strongSelf.beginMediaRecordingRequestId {
-                            videoRecorder.lockVideo()
+                            videoRecorder.lockVideoRecording()
                         }
                     }
                     strongSelf.updateDownButtonVisibility()
                     
                     if let previousVideoRecorderValue = previousVideoRecorderValue {
-                        previousVideoRecorderValue.dismissVideo()
+                        previousVideoRecorderValue.discardVideo()
                     }
                 }
             }
@@ -15475,68 +15477,59 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     isScheduledMessages = true
                 }
                 
-                self.videoRecorder.set(.single(legacyInstantVideoController(theme: self.presentationData.theme, forStory: false, panelFrame: self.view.convert(currentInputPanelFrame, to: nil), context: self.context, peerId: peerId, slowmodeState: !isScheduledMessages ? self.presentationInterfaceState.slowmodeState : nil, hasSchedule: !isScheduledMessages && peerId.namespace != Namespaces.Peer.SecretChat, send: { [weak self] videoController, message in
-                    if let strongSelf = self {
-                        guard let message = message else {
-                            strongSelf.videoRecorder.set(.single(nil))
+                let _ = peerId
+                let _ = isScheduledMessages
+                
+                let controller = VideoMessageCameraScreen(
+                    context: self.context,
+                    updatedPresentationData: self.updatedPresentationData,
+                    inputPanelFrame: currentInputPanelFrame,
+                    completion: { [weak self] message in
+                        guard let self, let videoController = self.videoRecorderValue else {
                             return
                         }
-
-                        let replyMessageSubject = strongSelf.presentationInterfaceState.interfaceState.replyMessageSubject
+                        let replyMessageSubject = self.presentationInterfaceState.interfaceState.replyMessageSubject
                         let correlationId = Int64.random(in: 0 ..< Int64.max)
                         
-                        let updatedMessage = message
+                        let message = message
                             .withUpdatedReplyToMessageId(replyMessageSubject?.subjectModel)
                             .withUpdatedCorrelationId(correlationId)
-                            .withUpdatedAttributes({ attributes in
-                                var attributes = attributes
-#if DEBUG
-                                attributes.append(AutoremoveTimeoutMessageAttribute(timeout: viewOnceTimeout, countdownBeginTime: nil))
-#endif
-                                return attributes
-                            })
-
+                        
                         var usedCorrelationId = false
-
-                        if strongSelf.chatDisplayNode.shouldAnimateMessageTransition, let extractedView = videoController.extractVideoSnapshot() {
+                        
+                        if self.chatDisplayNode.shouldAnimateMessageTransition, let extractedView = videoController.extractVideoSnapshot() {
                             usedCorrelationId = true
-                            strongSelf.chatDisplayNode.messageTransitionNode.add(correlationId: correlationId, source:  .videoMessage(ChatMessageTransitionNodeImpl.Source.VideoMessage(view: extractedView)), initiated: { [weak videoController] in
+                            self.chatDisplayNode.messageTransitionNode.add(correlationId: correlationId, source:  .videoMessage(ChatMessageTransitionNodeImpl.Source.VideoMessage(view: extractedView)), initiated: { [weak videoController, weak self] in
                                 videoController?.hideVideoSnapshot()
-                                guard let strongSelf = self else {
+                                guard let self else {
                                     return
                                 }
-                                strongSelf.videoRecorder.set(.single(nil))
+                                self.videoRecorder.set(.single(nil))
                             })
                         } else {
-                            strongSelf.videoRecorder.set(.single(nil))
+                            self.videoRecorder.set(.single(nil))
                         }
-
-                        strongSelf.chatDisplayNode.setupSendActionOnViewUpdate({
-                            if let strongSelf = self {
-                                strongSelf.chatDisplayNode.collapseInput()
+                        
+                        self.chatDisplayNode.setupSendActionOnViewUpdate({ [weak self] in
+                            if let self {
+                                self.chatDisplayNode.collapseInput()
                                 
-                                strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: false, {
-                                    $0.updatedInterfaceState { $0.withUpdatedReplyMessageSubject(nil) }
+                                self.updateChatPresentationInterfaceState(animated: true, interactive: false, {
+                                    $0.updatedRecordedMediaPreview(nil).updatedInterfaceState { $0.withUpdatedReplyMessageSubject(nil) }
                                 })
                             }
                         }, usedCorrelationId ? correlationId : nil)
-
-                        strongSelf.sendMessages([updatedMessage])
+                        
+                        self.sendMessages([message])
                     }
-                }, displaySlowmodeTooltip: { [weak self] view, rect in
-                    self?.interfaceInteraction?.displaySlowmodeTooltip(view, rect)
-                }, presentSchedulePicker: { [weak self] done in
-                    if let strongSelf = self {
-                        strongSelf.presentScheduleTimePicker(completion: { [weak self] time in
-                            if let strongSelf = self {
-                                done(time)
-                                if strongSelf.presentationInterfaceState.subject != .scheduledMessages && time != scheduleWhenOnlineTimestamp {
-                                    strongSelf.openScheduledMessages()
-                                }
-                            }
-                        })
+                )
+                controller.onResume = { [weak self] in
+                    guard let self else {
+                        return
                     }
-                })))
+                    self.resumeMediaRecorder()
+                }
+                self.videoRecorder.set(.single(controller))
             }
         }
     }
@@ -15590,7 +15583,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             strongSelf.context.account.postbox.mediaBox.storeResourceData(resource.id, data: data.compressedData)
                             
                             strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, {
-                                $0.updatedRecordedMediaPreview(ChatRecordedMediaPreview(resource: resource, duration: Int32(data.duration), fileSize: Int32(data.compressedData.count), waveform: AudioWaveform(bitstream: waveform, bitsPerSample: 5))).updatedInputTextPanelState { panelState in
+                                $0.updatedRecordedMediaPreview(.audio(ChatRecordedMediaPreview.Audio(resource: resource, fileSize: Int32(data.compressedData.count), duration: Int32(data.duration), waveform: AudioWaveform(bitstream: waveform, bitsPerSample: 5)))).updatedInputTextPanelState { panelState in
                                     return panelState.withUpdatedMediaRecordingState(nil)
                                 }
                             })
@@ -15657,18 +15650,59 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         } else if let videoRecorderValue = self.videoRecorderValue {
             if case .send = updatedAction {
                 self.chatDisplayNode.updateRecordedMediaDeleted(false)
-                videoRecorderValue.completeVideo()
+                videoRecorderValue.sendVideoRecording()
             } else {
                 if case .dismiss = updatedAction {
                     self.chatDisplayNode.updateRecordedMediaDeleted(true)
                 }
-                if case .preview = updatedAction, videoRecorderValue.stopVideo() {
-                    self.updateChatPresentationInterfaceState(animated: true, interactive: true, {
-                        $0.updatedInputTextPanelState { panelState in
-                            return panelState.withUpdatedMediaRecordingState(.video(status: .editing, isLocked: false))
-                        }
-                    })
-                } else {
+                
+                switch updatedAction {
+                case .preview, .pause:
+                    if videoRecorderValue.stopVideoRecording() {
+                        let _ = (videoRecorderValue.takenRecordedData()
+                        |> deliverOnMainQueue).startStandalone(next: { [weak self] data in
+                            if let strongSelf = self, let data = data {
+                                if data.duration < 0.5 {
+                                    strongSelf.recorderFeedback?.error()
+                                    strongSelf.recorderFeedback = nil
+                                    strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, {
+                                        $0.updatedInputTextPanelState { panelState in
+                                            return panelState.withUpdatedMediaRecordingState(nil)
+                                        }
+                                    })
+                                } else {
+                                    strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, {
+                                        $0.updatedRecordedMediaPreview(.video(
+                                            ChatRecordedMediaPreview.Video(
+                                                duration: Int32(data.duration),
+                                                frames: data.frames,
+                                                framesUpdateTimestamp: data.framesUpdateTimestamp,
+                                                trimRange: data.trimRange,
+                                                control: ChatRecordedMediaPreview.Video.Control(
+                                                    updateTrimRange: { [weak self] start, end, updatedEnd, apply in
+                                                        if let self, let videoRecorderValue = self.videoRecorderValue {
+                                                            videoRecorderValue.updateTrimRange(start: start, end: end, updatedEnd: updatedEnd, apply: apply)
+                                                        }
+                                                    }
+                                                )
+                                            )
+                                        )).updatedInputTextPanelState { panelState in
+                                            return panelState.withUpdatedMediaRecordingState(nil)
+                                        }
+                                    })
+                                    strongSelf.recorderFeedback = nil
+                                    strongSelf.updateDownButtonVisibility()
+                                }
+                            }
+                        })
+                        
+                        self.updateChatPresentationInterfaceState(animated: true, interactive: true, {
+                            $0.updatedInputTextPanelState { panelState in
+                                return panelState.withUpdatedMediaRecordingState(.video(status: .editing, isLocked: false))
+                            }
+                        })
+                    }
+                default:
                     self.videoRecorder.set(.single(nil))
                 }
             }
@@ -15683,13 +15717,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 audioRecorderValue.stop()
                 self.audioRecorder.set(.single(nil))
             }
-        } else if let videoRecorderValue = self.videoRecorderValue {
-            if videoRecorderValue.stopVideo() {
-                self.updateChatPresentationInterfaceState(animated: true, interactive: true, {
-                    $0.updatedInputTextPanelState { panelState in
-                        return panelState.withUpdatedMediaRecordingState(.video(status: .editing, isLocked: false))
-                    }
-                })
+        } else if let _ = self.videoRecorderValue {
+            if let _ = self.presentationInterfaceState.inputTextPanelState.mediaRecordingState {
+                self.dismissMediaRecorder(pause ? .pause : .preview)
             } else {
                 self.videoRecorder.set(.single(nil))
             }
@@ -15705,6 +15735,13 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     return panelState.withUpdatedMediaRecordingState(.audio(recorder: audioRecorderValue, isLocked: true))
                 }.updatedRecordedMediaPreview(nil)
             })
+        } else if let videoRecorderValue = self.videoRecorderValue {
+            self.updateChatPresentationInterfaceState(animated: true, interactive: true, {
+                $0.updatedInputTextPanelState { panelState in
+                    let recordingStatus = videoRecorderValue.recordingStatus
+                    return panelState.withUpdatedMediaRecordingState(.video(status: .recording(InstantVideoControllerRecordingStatus(micLevel: recordingStatus.micLevel, duration: recordingStatus.duration)), isLocked: true))
+                }.updatedRecordedMediaPreview(nil)
+            })
         }
     }
     
@@ -15717,10 +15754,16 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             })
         }
         
-        self.videoRecorderValue?.lockVideo()
+        self.videoRecorderValue?.lockVideoRecording()
     }
     
     func deleteMediaRecording() {
+        if let _ = self.audioRecorderValue {
+            self.audioRecorder.set(.single(nil))
+        } else if let _ = self.videoRecorderValue {
+            self.videoRecorder.set(.single(nil))
+        }
+        
         self.chatDisplayNode.updateRecordedMediaDeleted(true)
         self.updateChatPresentationInterfaceState(animated: true, interactive: true, {
             $0.updatedRecordedMediaPreview(nil)
@@ -15731,7 +15774,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
     func sendMediaRecording(silentPosting: Bool? = nil, scheduleTime: Int32? = nil, viewOnce: Bool = false) {
         self.chatDisplayNode.updateRecordedMediaDeleted(false)
         
-        if let recordedMediaPreview = self.presentationInterfaceState.recordedMediaPreview {
+        guard let recordedMediaPreview = self.presentationInterfaceState.recordedMediaPreview else {
+            return
+        }
+        
+        switch recordedMediaPreview {
+        case let .audio(audio):
             var isScheduledMessages = false
             if case .scheduledMessages = self.presentationInterfaceState.subject {
                 isScheduledMessages = true
@@ -15744,7 +15792,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 return
             }
             
-            let waveformBuffer = recordedMediaPreview.waveform.makeBitstream()
+            let waveformBuffer = audio.waveform.makeBitstream()
             
             self.chatDisplayNode.setupSendActionOnViewUpdate({ [weak self] in
                 if let strongSelf = self {
@@ -15763,7 +15811,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 attributes.append(AutoremoveTimeoutMessageAttribute(timeout: viewOnceTimeout, countdownBeginTime: nil))
             }
             
-            let messages: [EnqueueMessage] = [.message(text: "", attributes: attributes, inlineStickers: [:], mediaReference: .standalone(media: TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: Int64.random(in: Int64.min ... Int64.max)), partialReference: nil, resource: recordedMediaPreview.resource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "audio/ogg", size: Int64(recordedMediaPreview.fileSize), attributes: [.Audio(isVoice: true, duration: Int(recordedMediaPreview.duration), title: nil, performer: nil, waveform: waveformBuffer)])), threadId: self.chatLocation.threadId, replyToMessageId: self.presentationInterfaceState.interfaceState.replyMessageSubject?.subjectModel, replyToStoryId: nil, localGroupingKey: nil, correlationId: nil, bubbleUpEmojiOrStickersets: [])]
+            let messages: [EnqueueMessage] = [.message(text: "", attributes: attributes, inlineStickers: [:], mediaReference: .standalone(media: TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: Int64.random(in: Int64.min ... Int64.max)), partialReference: nil, resource: audio.resource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "audio/ogg", size: Int64(audio.fileSize), attributes: [.Audio(isVoice: true, duration: Int(audio.duration), title: nil, performer: nil, waveform: waveformBuffer)])), threadId: self.chatLocation.threadId, replyToMessageId: self.presentationInterfaceState.interfaceState.replyMessageSubject?.subjectModel, replyToStoryId: nil, localGroupingKey: nil, correlationId: nil, bubbleUpEmojiOrStickersets: [])]
             
             let transformedMessages: [EnqueueMessage]
             if let silentPosting = silentPosting {
@@ -15786,6 +15834,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             })
             
             donateSendMessageIntent(account: self.context.account, sharedContext: self.context.sharedContext, intentContext: .chat, peerIds: [peerId])
+        case .video:
+            self.videoRecorderValue?.sendVideoRecording()
         }
     }
     
diff --git a/submodules/TelegramUI/Sources/ChatHistoryListNode.swift b/submodules/TelegramUI/Sources/ChatHistoryListNode.swift
index 95f79c0197..f5502c578b 100644
--- a/submodules/TelegramUI/Sources/ChatHistoryListNode.swift
+++ b/submodules/TelegramUI/Sources/ChatHistoryListNode.swift
@@ -331,7 +331,8 @@ private func extractAssociatedData(
     maxReadStoryId: Int32?,
     recommendedChannels: RecommendedChannels?,
     audioTranscriptionTrial: AudioTranscription.TrialState,
-    chatThemes: [TelegramTheme]
+    chatThemes: [TelegramTheme],
+    deviceContactsNumbers: Set<String>
 ) -> ChatMessageItemAssociatedData {
     var automaticDownloadPeerId: EnginePeer.Id?
     var automaticMediaDownloadPeerType: MediaAutoDownloadPeerType = .channel
@@ -386,7 +387,7 @@ private func extractAssociatedData(
         automaticDownloadPeerId = message.peerId
     }
     
-    return ChatMessageItemAssociatedData(automaticDownloadPeerType: automaticMediaDownloadPeerType, automaticDownloadPeerId: automaticDownloadPeerId, automaticDownloadNetworkType: automaticDownloadNetworkType, isRecentActions: false, subject: subject, contactsPeerIds: contactsPeerIds, channelDiscussionGroup: channelDiscussionGroup, animatedEmojiStickers: animatedEmojiStickers, additionalAnimatedEmojiStickers: additionalAnimatedEmojiStickers, currentlyPlayingMessageId: currentlyPlayingMessageId, isCopyProtectionEnabled: isCopyProtectionEnabled, availableReactions: availableReactions, defaultReaction: defaultReaction, isPremium: isPremium, accountPeer: accountPeer, alwaysDisplayTranscribeButton: alwaysDisplayTranscribeButton, topicAuthorId: topicAuthorId, hasBots: hasBots, translateToLanguage: translateToLanguage, maxReadStoryId: maxReadStoryId, recommendedChannels: recommendedChannels, audioTranscriptionTrial: audioTranscriptionTrial, chatThemes: chatThemes)
+    return ChatMessageItemAssociatedData(automaticDownloadPeerType: automaticMediaDownloadPeerType, automaticDownloadPeerId: automaticDownloadPeerId, automaticDownloadNetworkType: automaticDownloadNetworkType, isRecentActions: false, subject: subject, contactsPeerIds: contactsPeerIds, channelDiscussionGroup: channelDiscussionGroup, animatedEmojiStickers: animatedEmojiStickers, additionalAnimatedEmojiStickers: additionalAnimatedEmojiStickers, currentlyPlayingMessageId: currentlyPlayingMessageId, isCopyProtectionEnabled: isCopyProtectionEnabled, availableReactions: availableReactions, defaultReaction: defaultReaction, isPremium: isPremium, accountPeer: accountPeer, alwaysDisplayTranscribeButton: alwaysDisplayTranscribeButton, topicAuthorId: topicAuthorId, hasBots: hasBots, translateToLanguage: translateToLanguage, maxReadStoryId: maxReadStoryId, recommendedChannels: recommendedChannels, audioTranscriptionTrial: audioTranscriptionTrial, chatThemes: chatThemes, deviceContactsNumbers: deviceContactsNumbers)
 }
 
 private extension ChatHistoryLocationInput {
@@ -1392,6 +1393,9 @@ public final class ChatHistoryListNodeImpl: ListView, ChatHistoryNode, ChatHisto
         
         let chatThemes = self.context.engine.themes.getChatThemes(accountManager: self.context.sharedContext.accountManager)
         
+        let deviceContactsNumbers = self.context.sharedContext.deviceContactPhoneNumbers.get()
+        |> distinctUntilChanged
+        
         let messageViewQueue = Queue.mainQueue()
         let historyViewTransitionDisposable = combineLatest(queue: messageViewQueue,
             historyViewUpdate,
@@ -1413,8 +1417,9 @@ public final class ChatHistoryListNodeImpl: ListView, ChatHistoryNode, ChatHisto
             maxReadStoryId,
             recommendedChannels,
             audioTranscriptionTrial,
-            chatThemes
-        ).startStrict(next: { [weak self] update, chatPresentationData, selectedMessages, updatingMedia, networkType, animatedEmojiStickers, additionalAnimatedEmojiStickers, customChannelDiscussionReadState, customThreadOutgoingReadState, availableReactions, defaultReaction, accountPeer, suggestAudioTranscription, promises, topicAuthorId, translationState, maxReadStoryId, recommendedChannels, audioTranscriptionTrial, chatThemes in
+            chatThemes,
+            deviceContactsNumbers
+        ).startStrict(next: { [weak self] update, chatPresentationData, selectedMessages, updatingMedia, networkType, animatedEmojiStickers, additionalAnimatedEmojiStickers, customChannelDiscussionReadState, customThreadOutgoingReadState, availableReactions, defaultReaction, accountPeer, suggestAudioTranscription, promises, topicAuthorId, translationState, maxReadStoryId, recommendedChannels, audioTranscriptionTrial, chatThemes, deviceContactsNumbers in
             let (historyAppearsCleared, pendingUnpinnedAllMessages, pendingRemovedMessages, currentlyPlayingMessageIdAndType, scrollToMessageId, chatHasBots, allAdMessages) = promises
             
             func applyHole() {
@@ -1573,7 +1578,7 @@ public final class ChatHistoryListNodeImpl: ListView, ChatHistoryNode, ChatHisto
                     translateToLanguage = languageCode
                 }
                 
-                let associatedData = extractAssociatedData(chatLocation: chatLocation, view: view, automaticDownloadNetworkType: networkType, animatedEmojiStickers: animatedEmojiStickers, additionalAnimatedEmojiStickers: additionalAnimatedEmojiStickers, subject: subject, currentlyPlayingMessageId: currentlyPlayingMessageIdAndType?.0, isCopyProtectionEnabled: isCopyProtectionEnabled, availableReactions: availableReactions, defaultReaction: defaultReaction, isPremium: isPremium, alwaysDisplayTranscribeButton: alwaysDisplayTranscribeButton, accountPeer: accountPeer, topicAuthorId: topicAuthorId, hasBots: chatHasBots, translateToLanguage: translateToLanguage, maxReadStoryId: maxReadStoryId, recommendedChannels: recommendedChannels, audioTranscriptionTrial: audioTranscriptionTrial, chatThemes: chatThemes)
+                let associatedData = extractAssociatedData(chatLocation: chatLocation, view: view, automaticDownloadNetworkType: networkType, animatedEmojiStickers: animatedEmojiStickers, additionalAnimatedEmojiStickers: additionalAnimatedEmojiStickers, subject: subject, currentlyPlayingMessageId: currentlyPlayingMessageIdAndType?.0, isCopyProtectionEnabled: isCopyProtectionEnabled, availableReactions: availableReactions, defaultReaction: defaultReaction, isPremium: isPremium, alwaysDisplayTranscribeButton: alwaysDisplayTranscribeButton, accountPeer: accountPeer, topicAuthorId: topicAuthorId, hasBots: chatHasBots, translateToLanguage: translateToLanguage, maxReadStoryId: maxReadStoryId, recommendedChannels: recommendedChannels, audioTranscriptionTrial: audioTranscriptionTrial, chatThemes: chatThemes, deviceContactsNumbers: deviceContactsNumbers)
                 
                 let filteredEntries = chatHistoryEntriesForView(
                     location: chatLocation,
diff --git a/submodules/TelegramUI/Sources/ChatMessageContextControllerContentSource.swift b/submodules/TelegramUI/Sources/ChatMessageContextControllerContentSource.swift
index cc8b2b0eb8..1e338807f7 100644
--- a/submodules/TelegramUI/Sources/ChatMessageContextControllerContentSource.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageContextControllerContentSource.swift
@@ -230,12 +230,9 @@ final class ChatViewOnceMessageContextExtractedContentSource: ContextExtractedCo
                 })
                 
                 if let messageNode = node as? ChatMessageItemView, let copyContentNode = messageNode.getMessageContextSourceNode(stableId: self.message.stableId) {
-                    let delta: CGFloat = 0.0// (width - 20.0 - messageNode.frame.height)
-                    self.initialAppearanceOffset = CGPoint(x: 0.0, y: -delta)
+                    self.initialAppearanceOffset = CGPoint(x: 0.0, y: width - 20.0 - copyContentNode.frame.height)
                     
-                    copyContentNode.contentNode.backgroundColor = UIColor.red.withAlphaComponent(0.5)
-                    
-                    messageNode.frame.origin.y = sourceRect.origin.y// chatNode.frame.height - sourceRect.origin.y - sourceRect.size.height
+                    messageNode.frame.origin.y = sourceRect.origin.y
                     chatNode.addSubnode(messageNode)
                     result = ContextControllerTakeViewInfo(containingItem: .node(copyContentNode), contentAreaInScreenSpace: chatNode.convert(chatNode.frameForVisibleArea(), to: nil))
                     
diff --git a/submodules/TelegramUI/Sources/ChatRecordingPreviewInputPanelNode.swift b/submodules/TelegramUI/Sources/ChatRecordingPreviewInputPanelNode.swift
index c06841f2a1..d437a299b7 100644
--- a/submodules/TelegramUI/Sources/ChatRecordingPreviewInputPanelNode.swift
+++ b/submodules/TelegramUI/Sources/ChatRecordingPreviewInputPanelNode.swift
@@ -17,6 +17,8 @@ import AudioWaveformNode
 import ChatInputPanelNode
 import TooltipUI
 import TelegramNotices
+import ComponentFlow
+import MediaScrubberComponent
 
 extension AudioWaveformNode: CustomMediaPlayerScrubbingForegroundNode {
 }
@@ -67,13 +69,15 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
     private let waveformButton: ASButtonNode
     let waveformBackgroundNode: ASImageNode
     
-    private var viewOnce = false
+    let scrubber = ComponentView<Empty>()
+    
+    var viewOnce = false
     let viewOnceButton: ChatRecordingViewOnceButtonNode
     let recordMoreButton: ChatRecordingViewOnceButtonNode
 
     private let waveformNode: AudioWaveformNode
     private let waveformForegroundNode: AudioWaveformNode
-    let waveformScubberNode: MediaPlayerScrubbingNode
+    let waveformScrubberNode: MediaPlayerScrubbingNode
     
     private var presentationInterfaceState: ChatPresentationInterfaceState?
     
@@ -129,7 +133,7 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
         self.waveformForegroundNode = AudioWaveformNode()
         self.waveformForegroundNode.isLayerBacked = true
         
-        self.waveformScubberNode = MediaPlayerScrubbingNode(content: .custom(backgroundNode: self.waveformNode, foregroundContentNode: self.waveformForegroundNode))
+        self.waveformScrubberNode = MediaPlayerScrubbingNode(content: .custom(backgroundNode: self.waveformNode, foregroundContentNode: self.waveformForegroundNode))
         
         self.durationLabel = MediaPlayerTimeTextNode(textColor: theme.chat.inputPanel.actionControlForegroundColor)
         self.durationLabel.alignment = .right
@@ -156,7 +160,7 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
         self.deleteButton.addSubnode(self.binNode)
         self.addSubnode(self.waveformBackgroundNode)
         self.addSubnode(self.sendButton)
-        self.addSubnode(self.waveformScubberNode)
+        self.addSubnode(self.waveformScrubberNode)
         self.addSubnode(self.playButton)
         self.addSubnode(self.durationLabel)
         self.addSubnode(self.waveformButton)
@@ -202,6 +206,8 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
             viewForOverlayContent.addSubnode(self.viewOnceButton)
             viewForOverlayContent.addSubnode(self.recordMoreButton)
         }
+        
+        self.view.disablesInteractiveTransitionGestureRecognizer = true
     }
     
     private func maybePresentViewOnceTooltip() {
@@ -242,35 +248,97 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
             }
             
             self.presentationInterfaceState = interfaceState
-                        
-            if let recordedMediaPreview = interfaceState.recordedMediaPreview, updateWaveform {
-                self.waveformNode.setup(color: interfaceState.theme.chat.inputPanel.actionControlForegroundColor.withAlphaComponent(0.5), gravity: .center, waveform: recordedMediaPreview.waveform)
-                self.waveformForegroundNode.setup(color: interfaceState.theme.chat.inputPanel.actionControlForegroundColor, gravity: .center, waveform: recordedMediaPreview.waveform)
-                
-                if self.mediaPlayer != nil {
-                    self.mediaPlayer?.pause()
-                }
-                if let context = self.context {
-                    let mediaManager = context.sharedContext.mediaManager
-                    let mediaPlayer = MediaPlayer(audioSessionManager: mediaManager.audioSession, postbox: context.account.postbox, userLocation: .other, userContentType: .audio, resourceReference: .standalone(resource: recordedMediaPreview.resource), streamable: .none, video: false, preferSoftwareDecoding: false, enableSound: true, fetchAutomatically: true)
-                    mediaPlayer.actionAtEnd = .action { [weak mediaPlayer] in
-                        mediaPlayer?.seek(timestamp: 0.0)
+                    
+            if let recordedMediaPreview = interfaceState.recordedMediaPreview, let context = self.context {
+                switch recordedMediaPreview {
+                case let .audio(audio):
+                    self.waveformButton.isHidden = false
+                    self.waveformBackgroundNode.isHidden = false
+                    self.waveformForegroundNode.isHidden = false
+                    self.waveformScrubberNode.isHidden = false
+                    self.playButton.isHidden = false
+                    self.durationLabel.isHidden = false
+                    
+                    if let view = self.scrubber.view, view.superview != nil {
+                        view.removeFromSuperview()
                     }
-                    self.mediaPlayer = mediaPlayer
-                    self.durationLabel.defaultDuration = Double(recordedMediaPreview.duration)
-                    self.durationLabel.status = mediaPlayer.status
-                    self.waveformScubberNode.status = mediaPlayer.status
-                    self.statusDisposable.set((mediaPlayer.status
+                    
+                    if updateWaveform {
+                        self.waveformNode.setup(color: interfaceState.theme.chat.inputPanel.actionControlForegroundColor.withAlphaComponent(0.5), gravity: .center, waveform: audio.waveform)
+                        self.waveformForegroundNode.setup(color: interfaceState.theme.chat.inputPanel.actionControlForegroundColor, gravity: .center, waveform: audio.waveform)
+                        if self.mediaPlayer != nil {
+                            self.mediaPlayer?.pause()
+                        }
+                        let mediaManager = context.sharedContext.mediaManager
+                        let mediaPlayer = MediaPlayer(audioSessionManager: mediaManager.audioSession, postbox: context.account.postbox, userLocation: .other, userContentType: .audio, resourceReference: .standalone(resource: audio.resource), streamable: .none, video: false, preferSoftwareDecoding: false, enableSound: true, fetchAutomatically: true)
+                        mediaPlayer.actionAtEnd = .action { [weak mediaPlayer] in
+                            mediaPlayer?.seek(timestamp: 0.0)
+                        }
+                        self.mediaPlayer = mediaPlayer
+                        self.durationLabel.defaultDuration = Double(audio.duration)
+                        self.durationLabel.status = mediaPlayer.status
+                        self.waveformScrubberNode.status = mediaPlayer.status
+                        self.statusDisposable.set((mediaPlayer.status
                         |> deliverOnMainQueue).startStrict(next: { [weak self] status in
-                        if let strongSelf = self {
-                            switch status.status {
+                            if let strongSelf = self {
+                                switch status.status {
                                 case .playing, .buffering(_, true, _, _):
                                     strongSelf.playPauseIconNode.enqueueState(.pause, animated: true)
                                 default:
                                     strongSelf.playPauseIconNode.enqueueState(.play, animated: true)
+                                }
                             }
+                        }))
+                    }
+                case let .video(video):
+                    self.waveformButton.isHidden = true
+                    self.waveformBackgroundNode.isHidden = true
+                    self.waveformForegroundNode.isHidden = true
+                    self.waveformScrubberNode.isHidden = true
+                    self.playButton.isHidden = true
+                    self.durationLabel.isHidden = true
+                    
+                    let scrubberSize = self.scrubber.update(
+                        transition: .immediate,
+                        component: AnyComponent(
+                            MediaScrubberComponent(
+                                context: context,
+                                style: .videoMessage,
+                                generationTimestamp: 0,
+                                position: 0,
+                                minDuration: 1.0,
+                                maxDuration: 60.0,
+                                isPlaying: false,
+                                tracks: [
+                                    MediaScrubberComponent.Track(
+                                        id: 0,
+                                        content: .video(frames: video.frames, framesUpdateTimestamp: video.framesUpdateTimestamp),
+                                        duration: Double(video.duration),
+                                        trimRange: video.trimRange,
+                                        offset: nil,
+                                        isMain: true
+                                    )
+                                ],
+                                positionUpdated: { _, _ in },
+                                trackTrimUpdated: { _, start, end, updatedEnd, apply in
+                                    video.control.updateTrimRange(start, end, updatedEnd, apply)
+                                },
+                                trackOffsetUpdated: { _, _, _ in },
+                                trackLongPressed: { _, _ in }
+                            )
+                        ),
+                        environment: {},
+                        forceUpdate: false,
+                        containerSize: CGSize(width: width - leftInset - rightInset - 45.0 * 2.0, height: 33.0)
+                    )
+                    
+                    if let view = self.scrubber.view {
+                        if view.superview == nil {
+                            self.view.addSubview(view)
                         }
-                    }))
+                        
+                        view.frame = CGRect(origin: CGPoint(x: leftInset + 45.0, y: 7.0 - UIScreenPixel), size: scrubberSize)
+                    }
                 }
             }
         }
@@ -327,7 +395,7 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
         let waveformBackgroundFrame = CGRect(origin: CGPoint(x: leftInset + 45.0, y: 7.0 - UIScreenPixel), size: CGSize(width: width - leftInset - rightInset - 90.0, height: 33.0))
         transition.updateFrame(node: self.waveformBackgroundNode, frame: waveformBackgroundFrame)
         transition.updateFrame(node: self.waveformButton, frame: CGRect(origin: CGPoint(x: leftInset + 45.0, y: 0.0), size: CGSize(width: width - leftInset - rightInset - 90.0, height: panelHeight)))
-        transition.updateFrame(node: self.waveformScubberNode, frame: CGRect(origin: CGPoint(x: leftInset + 45.0 + 35.0, y: 7.0 + floor((33.0 - 13.0) / 2.0)), size: CGSize(width: width - leftInset - rightInset - 90.0 - 45.0 - 40.0, height: 13.0)))
+        transition.updateFrame(node: self.waveformScrubberNode, frame: CGRect(origin: CGPoint(x: leftInset + 45.0 + 35.0, y: 7.0 + floor((33.0 - 13.0) / 2.0)), size: CGSize(width: width - leftInset - rightInset - 90.0 - 45.0 - 40.0, height: 13.0)))
         transition.updateFrame(node: self.durationLabel, frame: CGRect(origin: CGPoint(x: width - rightInset - 90.0 - 4.0, y: 15.0), size: CGSize(width: 35.0, height: 20.0)))
         
         prevInputPanelNode?.frame = CGRect(origin: .zero, size: CGSize(width: width, height: panelHeight))
@@ -369,6 +437,11 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
             
             prevTextInputPanelNode.actionButtons.micButton.animateOut(true)
             
+            if let view = self.scrubber.view {
+                view.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15)
+                view.layer.animatePosition(from: CGPoint(x: 0.0, y: 64.0), to: .zero, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, additive: true)
+            }
+            
             self.deleteButton.layer.animateScale(from: 0.3, to: 1.0, duration: 0.15)
             self.deleteButton.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15)
             
@@ -377,8 +450,8 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
                         
             self.durationLabel.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, delay: 0.1)
             
-            self.waveformScubberNode.layer.animateScaleY(from: 0.1, to: 1.0, duration: 0.3, delay: 0.1)
-            self.waveformScubberNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2, delay: 0.1)
+            self.waveformScrubberNode.layer.animateScaleY(from: 0.1, to: 1.0, duration: 0.3, delay: 0.1)
+            self.waveformScrubberNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2, delay: 0.1)
             
             self.waveformBackgroundNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15)
             self.waveformBackgroundNode.layer.animateFrame(
@@ -412,6 +485,7 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
     }
     
     @objc func sendPressed() {
+        self.viewOnce = false
         self.tooltipController?.dismiss()
         
         self.interfaceInteraction?.sendRecordedMedia(false, self.viewOnce)
diff --git a/submodules/TelegramUI/Sources/ChatTextInputActionButtonsNode.swift b/submodules/TelegramUI/Sources/ChatTextInputActionButtonsNode.swift
index 466642e10b..e748ee429d 100644
--- a/submodules/TelegramUI/Sources/ChatTextInputActionButtonsNode.swift
+++ b/submodules/TelegramUI/Sources/ChatTextInputActionButtonsNode.swift
@@ -47,7 +47,7 @@ final class ChatTextInputActionButtonsNode: ASDisplayNode {
         let strings = presentationInterfaceState.strings
         self.strings = strings
          
-        self.micButton = ChatTextInputMediaRecordingButton(context: context, theme: theme, strings: strings, presentController: presentController)
+        self.micButton = ChatTextInputMediaRecordingButton(context: context, theme: theme, pause: true, strings: strings, presentController: presentController)
         
         self.sendContainerNode = ASDisplayNode()
         self.sendContainerNode.layer.allowsGroupOpacity = true
diff --git a/submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift b/submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift
index 961325f02e..42a83038ef 100644
--- a/submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift
+++ b/submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift
@@ -2054,13 +2054,14 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate, Ch
                     self.actionButtons.micButton.audioRecorder = recorder
                     audioRecordingTimeNode.audioRecorder = recorder
                 case let .video(status, _):
+                    let hadVideoRecorder = self.actionButtons.micButton.videoRecordingStatus != nil
+                    if !hadVideoRecorder, isLocked {
+                        self.actionButtons.micButton.lock()
+                    }
                     switch status {
                     case let .recording(recordingStatus):
                         audioRecordingTimeNode.videoRecordingStatus = recordingStatus
                         self.actionButtons.micButton.videoRecordingStatus = recordingStatus
-                        if isLocked {
-                            audioRecordingCancelIndicator.layer.animateAlpha(from: audioRecordingCancelIndicator.alpha, to: 0, duration: 0.15, delay: 0, removeOnCompletion: false)
-                        }
                     case .editing:
                         audioRecordingTimeNode.videoRecordingStatus = nil
                         self.actionButtons.micButton.videoRecordingStatus = nil
@@ -2561,46 +2562,64 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate, Ch
         if let prevPreviewInputPanelNode = self.prevInputPanelNode as? ChatRecordingPreviewInputPanelNode {
             self.prevInputPanelNode = nil
             
-            if prevPreviewInputPanelNode.viewOnceButton.alpha > 0.0 {
-                if let snapshotView = prevPreviewInputPanelNode.viewOnceButton.view.snapshotContentTree() {
-                    snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { _ in
-                        snapshotView.removeFromSuperview()
-                    })
-                    snapshotView.layer.animateScale(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
-                    self.viewForOverlayContent?.addSubview(snapshotView)
+            if !prevPreviewInputPanelNode.viewOnceButton.isHidden {
+                self.viewOnce = prevPreviewInputPanelNode.viewOnce
+                self.viewOnceButton.update(isSelected: prevPreviewInputPanelNode.viewOnce, animated: false)
+                self.viewOnceButton.layer.animatePosition(from: prevPreviewInputPanelNode.viewOnceButton.position, to: self.viewOnceButton.position, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, completion: { _ in
+                })
+            }
+            
+            let animateOutPreviewButton: (ASDisplayNode) -> Void = { button in
+                if button.alpha > 0.0 {
+                    if let snapshotView = button.view.snapshotContentTree() {
+                        snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { _ in
+                            snapshotView.removeFromSuperview()
+                        })
+                        snapshotView.layer.animateScale(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
+                        self.viewForOverlayContent?.addSubview(snapshotView)
+                    }
                 }
             }
             
+            animateOutPreviewButton(prevPreviewInputPanelNode.viewOnceButton)
+            animateOutPreviewButton(prevPreviewInputPanelNode.recordMoreButton)
+                        
             prevPreviewInputPanelNode.gestureRecognizer?.isEnabled = false
             prevPreviewInputPanelNode.isUserInteractionEnabled = false
             
             if self.isMediaDeleted {
-                func animatePosition(for previewSubnode: ASDisplayNode) {
-                    previewSubnode.layer.animatePosition(
-                        from: previewSubnode.position,
-                        to: CGPoint(x: leftMenuInset.isZero ? previewSubnode.position.x - 20 : leftMenuInset + previewSubnode.frame.width / 2.0, y: previewSubnode.position.y),
+                func animatePosition(for previewLayer: CALayer) {
+                    previewLayer.animatePosition(
+                        from: previewLayer.position,
+                        to: CGPoint(x: leftMenuInset.isZero ? previewLayer.position.x - 20 : leftMenuInset + previewLayer.frame.width / 2.0, y: previewLayer.position.y),
                         duration: 0.15
                     )
                 }
                 
-                animatePosition(for: prevPreviewInputPanelNode.waveformBackgroundNode)
-                animatePosition(for: prevPreviewInputPanelNode.waveformScubberNode)
-                animatePosition(for: prevPreviewInputPanelNode.durationLabel)
-                animatePosition(for: prevPreviewInputPanelNode.playButton)
+                animatePosition(for: prevPreviewInputPanelNode.waveformBackgroundNode.layer)
+                animatePosition(for: prevPreviewInputPanelNode.waveformScrubberNode.layer)
+                animatePosition(for: prevPreviewInputPanelNode.durationLabel.layer)
+                animatePosition(for: prevPreviewInputPanelNode.playButton.layer)
+                if let view = prevPreviewInputPanelNode.scrubber.view {
+                    animatePosition(for: view.layer)
+                }
             }
             
-            func animateAlpha(for previewSubnode: ASDisplayNode) {
-                previewSubnode.layer.animateAlpha(
+            func animateAlpha(for previewLayer: CALayer) {
+                previewLayer.animateAlpha(
                     from: 1.0,
                     to: 0.0,
                     duration: 0.15,
                     removeOnCompletion: false
                 )
             }
-            animateAlpha(for: prevPreviewInputPanelNode.waveformBackgroundNode)
-            animateAlpha(for: prevPreviewInputPanelNode.waveformScubberNode)
-            animateAlpha(for: prevPreviewInputPanelNode.durationLabel)
-            animateAlpha(for: prevPreviewInputPanelNode.playButton)
+            animateAlpha(for: prevPreviewInputPanelNode.waveformBackgroundNode.layer)
+            animateAlpha(for: prevPreviewInputPanelNode.waveformScrubberNode.layer)
+            animateAlpha(for: prevPreviewInputPanelNode.durationLabel.layer)
+            animateAlpha(for: prevPreviewInputPanelNode.playButton.layer)
+            if let view = prevPreviewInputPanelNode.scrubber.view {
+                animateAlpha(for: view.layer)
+            }
                     
             let binNode = prevPreviewInputPanelNode.binNode
             self.animatingBinNode = binNode
@@ -2632,6 +2651,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate, Ch
             }
             
             if self.isMediaDeleted && !isRecording {
+                self.attachmentButton.layer.animateAlpha(from: 0.0, to: 0, duration: 0.01, delay: 0.0, removeOnCompletion: false)
                 binNode.completion = dismissBin
                 binNode.play()
             } else {
diff --git a/submodules/TelegramUI/Sources/SharedAccountContext.swift b/submodules/TelegramUI/Sources/SharedAccountContext.swift
index 9f59085c60..a87483fa3f 100644
--- a/submodules/TelegramUI/Sources/SharedAccountContext.swift
+++ b/submodules/TelegramUI/Sources/SharedAccountContext.swift
@@ -166,6 +166,7 @@ public final class SharedAccountContextImpl: SharedAccountContext {
     
     public let enablePreloads = Promise<Bool>()
     public let hasPreloadBlockingContent = Promise<Bool>(false)
+    public let deviceContactPhoneNumbers = Promise<Set<String>>(Set())
     
     private var accountUserInterfaceInUseContexts: [AccountRecordId: AccountUserInterfaceInUseContext] = [:]