diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings index a896f1b90f..c2e713aae1 100644 --- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings @@ -4289,6 +4289,7 @@ Unused sets are archived when you add more."; "Settings.CheckPhoneNumberText" = "Keep your number up to date to ensure you can always log in to Telegram. [Learn more]()"; "Settings.KeepPhoneNumber" = "Keep %@"; "Settings.ChangePhoneNumber" = "Change Number"; +"Settings.CheckPhoneNumberFAQAnchor" = "q-i-have-a-new-phone-number-what-do-i-do"; "Undo.ChatDeletedForBothSides" = "Chat deleted for both sides"; diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatController.swift b/submodules/TelegramCallsUI/Sources/VoiceChatController.swift index 82adac7ae7..b6042eba0f 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatController.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatController.swift @@ -5827,6 +5827,10 @@ public final class VoiceChatController: ViewController { let translation = recognizer.translation(in: self.contentContainer.view) var velocity = recognizer.velocity(in: self.contentContainer.view) + if self.isScheduled && (translation.y < 0.0 || velocity.y < 0.0) { + return + } + if case let .known(value) = contentOffset, value > 0.0 { velocity = CGPoint() } else if case .unknown = contentOffset { diff --git a/submodules/TelegramUI/Sources/ChatMediaInputGridEntries.swift b/submodules/TelegramUI/Sources/ChatMediaInputGridEntries.swift index 2e1671d13e..4149960057 100644 --- a/submodules/TelegramUI/Sources/ChatMediaInputGridEntries.swift +++ b/submodules/TelegramUI/Sources/ChatMediaInputGridEntries.swift @@ -142,6 +142,9 @@ enum ChatMediaInputGridEntry: Equatable, Comparable, Identifiable { if lhsStrings !== rhsStrings { return false } + if lhsPacks.count != rhsPacks.count { + return false + } for i in 0 ..< lhsPacks.count { if lhsPacks[i].unread != rhsPacks[i].unread { return false diff --git a/submodules/TelegramUI/Sources/PeachHaptic.swift b/submodules/TelegramUI/Sources/PeachHaptic.swift index e92ffeb0af..10a6d757ab 100644 --- a/submodules/TelegramUI/Sources/PeachHaptic.swift +++ b/submodules/TelegramUI/Sources/PeachHaptic.swift @@ -2,7 +2,7 @@ import Foundation import Display import SwiftSignalKit -private let impactTime: Double = 0.4 +private let impactTime: Double = 0.6 final class PeachHaptic: EmojiHaptic { private var hapticFeedback = HapticFeedback() diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift index 106d7ec186..5d1a37cb24 100644 --- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift +++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift @@ -701,7 +701,7 @@ private func settingsItems(data: PeerInfoScreenData?, context: AccountContext, p let phoneNumber = formatPhoneNumber(peer.phone ?? "") items[.phone]!.append(PeerInfoScreenInfoItem(id: 0, title: presentationData.strings.Settings_CheckPhoneNumberTitle(phoneNumber).string, text: .markdown(presentationData.strings.Settings_CheckPhoneNumberText), linkAction: { link in if case .tap = link { - interaction.openFaq("q-i-have-a-new-phone-number-what-do-i-do") + interaction.openFaq(presentationData.strings.Settings_CheckPhoneNumberFAQAnchor) } })) items[.phone]!.append(PeerInfoScreenActionItem(id: 1, text: presentationData.strings.Settings_KeepPhoneNumber(phoneNumber).string, action: {