diff --git a/submodules/Components/SheetComponent/Sources/SheetComponent.swift b/submodules/Components/SheetComponent/Sources/SheetComponent.swift index 3ab3ae108c..69ed8881fa 100644 --- a/submodules/Components/SheetComponent/Sources/SheetComponent.swift +++ b/submodules/Components/SheetComponent/Sources/SheetComponent.swift @@ -341,7 +341,7 @@ public final class SheetComponent: C let contentOffset = (self.scrollView.contentOffset.y + self.scrollView.contentInset.top - self.scrollView.contentSize.height) * -1.0 let dismissalOffset = self.scrollView.contentSize.height + abs(contentView.frame.minY) let delta = dismissalOffset - contentOffset - var targetPosition = self.scrollView.center.y + delta + var targetPosition = self.scrollView.center.y + delta + 6.0 if self.isCentered { targetPosition = self.frame.height + self.scrollView.frame.height * 0.5 } @@ -350,7 +350,7 @@ public final class SheetComponent: C completion() }) } else { - var targetOffset: CGFloat = self.scrollView.contentSize.height + abs(contentView.frame.minY) + var targetOffset: CGFloat = self.scrollView.contentSize.height + abs(contentView.frame.minY) + 6.0 if self.isCentered { targetOffset = self.frame.height + self.scrollView.frame.height * 0.5 } diff --git a/submodules/StatisticsUI/Sources/ChannelStatsController.swift b/submodules/StatisticsUI/Sources/ChannelStatsController.swift index 3602d25336..af215827d8 100644 --- a/submodules/StatisticsUI/Sources/ChannelStatsController.swift +++ b/submodules/StatisticsUI/Sources/ChannelStatsController.swift @@ -1229,7 +1229,7 @@ private enum StatsEntry: ItemListNodeEntry { arguments.presentCpmLocked() }) case .earnStarsInfo: - return ItemListDisclosureItem(presentationData: presentationData, icon: PresentationResourcesSettings.earnStars, title: presentationData.strings.Monetization_EarnStarsInfo_Title, titleBadge: presentationData.strings.Settings_New, label: presentationData.strings.Monetization_EarnStarsInfo_Text, labelStyle: .multilineDetailText, sectionId: self.section, style: .blocks, action: { + return ItemListDisclosureItem(presentationData: presentationData, icon: PresentationResourcesSettings.earnStars, title: presentationData.strings.Monetization_EarnStarsInfo_Title, titleBadge: nil, label: presentationData.strings.Monetization_EarnStarsInfo_Text, labelStyle: .multilineDetailText, sectionId: self.section, style: .blocks, action: { arguments.openEarnStars() }) } diff --git a/submodules/TelegramUI/Sources/SharedAccountContext.swift b/submodules/TelegramUI/Sources/SharedAccountContext.swift index c233cf1b38..eecfcaab7c 100644 --- a/submodules/TelegramUI/Sources/SharedAccountContext.swift +++ b/submodules/TelegramUI/Sources/SharedAccountContext.swift @@ -3195,6 +3195,8 @@ public final class SharedAccountContextImpl: SharedAccountContext { guard let controller, case let .starGiftTransfer(_, _, gift, transferStars, _, _) = source else { return } + controller.view.window?.endEditing(true) + var dismissAlertImpl: (() -> Void)? let alertController = giftTransferAlertController( context: context, diff --git a/submodules/UrlHandling/Sources/UrlHandling.swift b/submodules/UrlHandling/Sources/UrlHandling.swift index df20c4e013..82ace72799 100644 --- a/submodules/UrlHandling/Sources/UrlHandling.swift +++ b/submodules/UrlHandling/Sources/UrlHandling.swift @@ -1261,9 +1261,9 @@ public func isTelegramMeLink(_ url: String) -> Bool { public func isTelegraPhLink(_ url: String) -> Bool { let schemes = ["http://", "https://", ""] - for basePath in baseTelegramMePaths { + for basePath in baseTelegraPhPaths { for scheme in schemes { - let basePrefix = scheme + basePath + "/" + let basePrefix = scheme + basePath if url.lowercased().hasPrefix(basePrefix) { return true }