Merge commit '15fd6d7b37d0a2bbd522cf22ec0cdfdb595144e3'

Author: Isaac

Telegram/Telegram-iOS/en.lproj/Localizable.strings

@@ -13870,6 +13870,12 @@ Sorry for the inconvenience.";
 "Stars.Intro.Transaction.PaidMessage_1" = "Fee for %@ Message";
 "Stars.Intro.Transaction.PaidMessage_any" = "Fee for %@ Messages";
 
+"Stars.Transaction.TelegramPremium_1" = "Premium for %@ Month";
+"Stars.Transaction.TelegramPremium_any" = "Premium for %@ Months";
+
+"Stars.Intro.Transaction.TelegramPremium_1" = "Premium for %@ Month";
+"Stars.Intro.Transaction.TelegramPremium_any" = "Premium for %@ Months";
+
 "Stars.Purchase.SendMessageInfo" = "Buy Stars to send a message to **%@**.";
 "Stars.Purchase.SendGroupMessageInfo" = "Buy Stars to send a message in **%@**.";
 

submodules/LegacyMediaPickerUI/Sources/LegacyPaintStickersContext.swift

@@ -629,6 +629,7 @@ private class SendStarsButtonView: HighlightTrackingButton, TGPhotoSendStarsButt
 
     override init(frame: CGRect) {
         self.backgroundView = UIView()
+        self.backgroundView.isUserInteractionEnabled = false
 
         self.textNode = ImmediateAnimatedCountLabelNode()
         self.textNode.isUserInteractionEnabled = false
@@ -654,12 +655,22 @@ private class SendStarsButtonView: HighlightTrackingButton, TGPhotoSendStarsButt
                 self.textNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2)
             }
         }
+        
+        self.addTarget(self, action: #selector(self.buttonPressed), for: .touchUpInside)
     }
 
     required init?(coder: NSCoder) {
         preconditionFailure()
     }
 
+    deinit {
+        print()
+    }
+    
+    @objc private func buttonPressed() {
+        self.pressed?()
+    }
+    
     func updateFrame(_ frame: CGRect) {
         let transition: ContainedViewLayoutTransition
         if self.frame.width.isZero {

submodules/MediaPickerUI/Sources/MediaPickerScreen.swift

@@ -1322,7 +1322,7 @@ public final class MediaPickerScreenImpl: ViewController, MediaPickerScreen, Att
                 }
             }
 
-            let proceed: (Bool) -> Void = { convertToJpeg in
+            let proceed: (Bool) -> Void = { [weak self] convertToJpeg in
                 let signals: [Any]!
                 switch controller.subject {
                 case .assets:
@@ -1340,6 +1340,11 @@ public final class MediaPickerScreenImpl: ViewController, MediaPickerScreen, Att
                     completion()
                     self?.controller?.dismiss(animated: animated)
                 })
+                
+                Queue.mainQueue().after(1.5) {
+                    controller.isDismissing = false
+                    controller.completed = false
+                }
             }
 
             if asFile && hasHeic {

submodules/PremiumUI/Sources/PremiumIntroScreen.swift

@@ -885,13 +885,7 @@ struct PremiumIntroConfiguration {
             if perks.count < 4 {
                 perks = PremiumIntroConfiguration.defaultValue.perks
             }
-            
-            #if DEBUG
-            if !perks.contains(.paidMessages) {
-                perks.append(.paidMessages)
-            }
-            #endif
-            
+                        
             var businessPerks: [PremiumPerk] = []
             if let values = data["business_promo_order"] as? [String] {
                 for value in values {

submodules/SettingsUI/Sources/Privacy and Security/IncomingMessagePrivacyScreen.swift

@@ -356,7 +356,7 @@ public func incomingMessagePrivacyScreen(context: AccountContext, value: GlobalP
         },
         openPremiumInfo: {
             var replaceImpl: ((ViewController) -> Void)?
-            let controller = context.sharedContext.makePremiumDemoController(context: context, subject: .paidMessages, forceDark: false, action: {
+            let controller = context.sharedContext.makePremiumDemoController(context: context, subject: .messagePrivacy, forceDark: false, action: {
                 let controller = context.sharedContext.makePremiumIntroController(context: context, source: .paidMessages, forceDark: false, dismissed: nil)
                 replaceImpl?(controller)
             }, dismissed: nil)

submodules/ShareController/Sources/ShareControllerNode.swift

@@ -1328,9 +1328,11 @@ final class ShareControllerNode: ViewControllerTracingNode, ASScrollViewDelegate
         if !self.inputFieldNode.text.isEmpty {
             count += 1
         }
+        var chargingPeers: [EnginePeer] = []
         var totalAmount: StarsAmount = .zero
         for peer in peers {
             if let stars = requiresStars[peer.id] {
+                chargingPeers.append(peer)
                 totalAmount = totalAmount + StarsAmount(value: stars, nanos: 0)
             }
         }
@@ -1339,7 +1341,7 @@ final class ShareControllerNode: ViewControllerTracingNode, ASScrollViewDelegate
                 context: nil,
                 presentationData: self.presentationData,
                 updatedPresentationData: nil,
-                peers: peers,
+                peers: chargingPeers,
                 count: count,
                 amount: totalAmount,
                 totalAmount: totalAmount,

submodules/TelegramCore/Sources/TelegramEngine/Privacy/UpdatedAccountPrivacySettings.swift

@@ -352,7 +352,8 @@ func _internal_updateGlobalPrivacySettings(account: Account, settings: GlobalPri
     var noncontactPeersPaidStars: Int64?
     switch settings.nonContactChatsPrivacy {
     case .everybody:
-        break
+        flags |= 1 << 5
+        noncontactPeersPaidStars = 0
     case .requirePremium:
         flags |= 1 << 4
     case let .paidMessages(starsAmount):

submodules/TelegramUI/Components/Chat/ChatUserInfoItem/Sources/ChatUserInfoItem.swift

@@ -219,11 +219,14 @@ public final class ChatUserInfoItemNode: ListViewItemNode, ASGestureRecognizerDe
     }
 
     public override func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
-        let location = gestureRecognizer.location(in: self.offsetContainer.view)
-        if let backgroundContent = self.backgroundContent, backgroundContent.frame.contains(location) {
-            return true
+        if gestureRecognizer.view === self.offsetContainer.view {
+            let location = gestureRecognizer.location(in: self.offsetContainer.view)
+            if let backgroundContent = self.backgroundContent, backgroundContent.frame.contains(location) {
+                return true
+            }
+            return false
         }
-        return false
+        return true
     }
 
     @objc private func tapGesture(_ gestureRecognizer: UITapGestureRecognizer) {
@@ -366,7 +369,7 @@ public final class ChatUserInfoItemNode: ListViewItemNode, ASGestureRecognizerDe
             var estimatedValueOffset: CGFloat = 0.0
             if groupsInCommonCount > 0 {
                 groupsValueText = NSMutableAttributedString(string: item.presentationData.strings.Chat_NonContactUser_GroupsCount(groupsInCommonCount), font: Font.semibold(13.0), textColor: primaryTextColor)
-                estimatedValueOffset = avatarImageSize + CGFloat(min(2, max(0, item.groupsInCommonCount - 1))) * avatarSpacing + 4.0
+                estimatedValueOffset = avatarImageSize + CGFloat(min(2, max(0, item.groupsInCommonCount - 1))) * avatarSpacing + 4.0 + 10.0
             } else {
                 groupsValueText = NSMutableAttributedString(string: "", font: Font.semibold(13.0), textColor: primaryTextColor)
             }
@@ -380,7 +383,7 @@ public final class ChatUserInfoItemNode: ListViewItemNode, ASGestureRecognizerDe
                 backgroundSize.height += groupsValueLayoutAndApply?.0.size.height ?? 0.0
 
                 maxTitleWidth = max(maxTitleWidth, groupsTitleLayoutAndApply?.0.size.width ?? 0)
-                maxValueWidth = max(maxValueWidth, groupsValueLayoutAndApply?.0.size.width ?? 0 + estimatedValueOffset)
+                maxValueWidth = max(maxValueWidth, (groupsValueLayoutAndApply?.0.size.width ?? 0) + estimatedValueOffset)
             } else {
                 groupsTitleLayoutAndApply = nil
                 groupsValueLayoutAndApply = nil
@@ -474,15 +477,15 @@ public final class ChatUserInfoItemNode: ListViewItemNode, ASGestureRecognizerDe
 
                     var attributeMidpoints: [CGFloat] = []
 
-                    func appendAttributeMidpoint(titleLayout: TextNodeLayout?, valueLayout: TextNodeLayout?) {
+                    func appendAttributeMidpoint(titleLayout: TextNodeLayout?, valueLayout: TextNodeLayout?, valueOffset: CGFloat = 0.0) {
                         if let valueLayout {
-                            let midpoint = backgroundSize.width - horizontalContentInset - valueLayout.size.width - attributeSpacing / 2.0
+                            let midpoint = backgroundSize.width - horizontalContentInset - valueLayout.size.width - valueOffset - attributeSpacing / 2.0
                             attributeMidpoints.append(midpoint)
                         }
                     }
                     appendAttributeMidpoint(titleLayout: phoneCountryTitleLayoutAndApply?.0, valueLayout: phoneCountryValueLayoutAndApply?.0)
                     appendAttributeMidpoint(titleLayout: registrationDateTitleLayoutAndApply?.0, valueLayout: registrationDateValueLayoutAndApply?.0)
-                    appendAttributeMidpoint(titleLayout: groupsTitleLayoutAndApply?.0, valueLayout: groupsValueLayoutAndApply?.0)
+                    appendAttributeMidpoint(titleLayout: groupsTitleLayoutAndApply?.0, valueLayout: groupsValueLayoutAndApply?.0, valueOffset: estimatedValueOffset)
 
                     let middleX = floorToScreenPixels(attributeMidpoints.min() ?? backgroundSize.width / 2.0)
 

submodules/TelegramUI/Components/Gifts/GiftViewScreen/Sources/GiftViewScreen.swift

@@ -2678,7 +2678,7 @@ public class GiftViewScreen: ViewControllerComponentContainer {
         }
 
         convertToStarsImpl = { [weak self] in
-            guard let self, let arguments = self.subject.arguments, let reference = arguments.reference, let fromPeerName = arguments.fromPeerName, let convertStars = arguments.convertStars, let navigationController = self.navigationController as? NavigationController else {
+            guard let self, let starsContext = context.starsContext, let arguments = self.subject.arguments, let reference = arguments.reference, let fromPeerName = arguments.fromPeerName, let convertStars = arguments.convertStars, let navigationController = self.navigationController as? NavigationController else {
                 return
             }
 
@@ -2725,6 +2725,8 @@ public class GiftViewScreen: ViewControllerComponentContainer {
 
                             if let navigationController {
                                 Queue.mainQueue().after(0.5) {
+                                    starsContext.load(force: true)
+                                    
                                     let text: String
                                     if isChannelGift {
                                         text = presentationData.strings.Gift_Convert_Success_ChannelText(presentationData.strings.Gift_Convert_Success_ChannelText_Stars(Int32(convertStars))).string

submodules/TelegramUI/Components/MessageInputPanelComponent/Sources/MessageInputPanelComponent.swift

@@ -1452,7 +1452,7 @@ public final class MessageInputPanelComponent: Component {
                     inputActionButtonMode = .send
                 } else {
                     if self.textFieldExternalState.hasText {
-                        if let sendPaidMessageStars = component.sendPaidMessageStars {
+                        if let sendPaidMessageStars = component.sendPaidMessageStars, "".isEmpty {
                             inputActionButtonMode = .stars(sendPaidMessageStars.value)
                         } else {
                             inputActionButtonMode = .send

submodules/TelegramUI/Components/PeerInfo/PeerInfoCoverComponent/BUILD

@@ -22,6 +22,7 @@ swift_library(
         "//submodules/Components/ComponentDisplayAdapters",
         "//submodules/TelegramUI/Components/EmojiTextAttachmentView",
         "//submodules/Utils/LokiRng",
+        "//submodules/TextFormat",
     ],
     visibility = [
         "//visibility:public",