Merge commit '9d34773d1ca767122b4307b1a3d40065ec0532e2'

Isaac · Isaac · commit 507ff0555b5f · 2025-11-14T16:05:38.000+08:00
diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
@@ -15384,11 +15384,6 @@ Error: %8$@";
 "Gift.AuctionTransfer.TextToYourself" = "The current recipient of this gift is **%@**. Change to yourself?";
 "Gift.AuctionTransfer.Change" = "Change";
 
-"Notification.StarGift.Subtitle.NoConvert" = "We'll notify you once it becomes eligible for unique upgrades.";
-"Notification.StarGift.Subtitle.OtherNoConvert" = "We'll notify %1$@ once it becomes eligible for unique upgrades.";
-"Gift.View.NoConvertDescription" = "We'll notify you once it becomes eligible for unique upgrades.";
-"Gift.View.OtherNoConvertDescription" = "We'll notify %1$@ once it becomes eligible for unique upgrades.";
-
 "Story.LiveBadge" = "LIVE";
 "SendStarReactions.LiveStreamPerk1Title" = "pin in chat";
 "SendStarReactions.LiveStreamPerk2Title" = "characters";
diff --git a/build_number_offset b/build_number_offset
@@ -1 +1 @@
-2600
+2620
diff --git a/submodules/AttachmentTextInputPanelNode/Sources/AttachmentTextInputActionButtonsNode.swift b/submodules/AttachmentTextInputPanelNode/Sources/AttachmentTextInputActionButtonsNode.swift
@@ -152,8 +152,10 @@ final class AttachmentTextInputActionButtonsNode: ASDisplayNode, ChatSendMessage
             }
             titleOffset -= 2.0
             buttonInset = 14.0
+            self.iconNode.isHidden = true
         } else {
             segments.append(.text(0, NSAttributedString(string: text, font: Font.semibold(17.0), textColor: interfaceState.theme.chat.inputPanel.actionControlForegroundColor)))
+            self.iconNode.isHidden = false
         }
         self.textNode.segments = segments
         
diff --git a/submodules/ComponentFlow/Source/Components/Button.swift b/submodules/ComponentFlow/Source/Components/Button.swift
@@ -4,6 +4,7 @@ import UIKit
 public final class Button: Component {
     public let content: AnyComponent<Empty>
     public let minSize: CGSize?
+    public let hitTestEdgeInsets: UIEdgeInsets?
     public let tag: AnyObject?
     public let automaticHighlight: Bool
     public let isEnabled: Bool
@@ -22,6 +23,7 @@ public final class Button: Component {
         self.init(
             content: content,
             minSize: nil,
+            hitTestEdgeInsets: nil,
             tag: nil,
             automaticHighlight: automaticHighlight,
             isEnabled: isEnabled,
@@ -34,6 +36,7 @@ public final class Button: Component {
     private init(
         content: AnyComponent<Empty>,
         minSize: CGSize? = nil,
+        hitTestEdgeInsets: UIEdgeInsets? = nil,
         tag: AnyObject? = nil,
         automaticHighlight: Bool = true,
         isEnabled: Bool = true,
@@ -44,6 +47,7 @@ public final class Button: Component {
     ) {
         self.content = content
         self.minSize = minSize
+        self.hitTestEdgeInsets = hitTestEdgeInsets
         self.tag = tag
         self.automaticHighlight = automaticHighlight
         self.isEnabled = isEnabled
@@ -57,6 +61,22 @@ public final class Button: Component {
         return Button(
             content: self.content,
             minSize: minSize,
+            hitTestEdgeInsets: self.hitTestEdgeInsets,
+            tag: self.tag,
+            automaticHighlight: self.automaticHighlight,
+            isEnabled: self.isEnabled,
+            isExclusive: self.isExclusive,
+            action: self.action,
+            holdAction: self.holdAction,
+            highlightedAction: self.highlightedAction
+        )
+    }
+    
+    public func withHitTestEdgeInsets(_ hitTestEdgeInsets: UIEdgeInsets?) -> Button {
+        return Button(
+            content: self.content,
+            minSize: self.minSize,
+            hitTestEdgeInsets: hitTestEdgeInsets,
             tag: self.tag,
             automaticHighlight: self.automaticHighlight,
             isEnabled: self.isEnabled,
@@ -71,6 +91,7 @@ public final class Button: Component {
         return Button(
             content: self.content,
             minSize: self.minSize,
+            hitTestEdgeInsets: self.hitTestEdgeInsets,
             tag: self.tag,
             automaticHighlight: self.automaticHighlight,
             isEnabled: self.isEnabled,
@@ -86,6 +107,7 @@ public final class Button: Component {
         return Button(
             content: self.content,
             minSize: self.minSize,
+            hitTestEdgeInsets: self.hitTestEdgeInsets,
             tag: self.tag,
             automaticHighlight: self.automaticHighlight,
             isEnabled: self.isEnabled,
@@ -100,6 +122,7 @@ public final class Button: Component {
         return Button(
             content: self.content,
             minSize: self.minSize,
+            hitTestEdgeInsets: self.hitTestEdgeInsets,
             tag: tag,
             automaticHighlight: self.automaticHighlight,
             isEnabled: self.isEnabled,
@@ -117,6 +140,9 @@ public final class Button: Component {
         if lhs.minSize != rhs.minSize {
             return false
         }
+        if lhs.hitTestEdgeInsets != rhs.hitTestEdgeInsets {
+            return false
+        }
         if lhs.tag !== rhs.tag {
             return false
         }
@@ -174,6 +200,14 @@ public final class Button: Component {
         private var holdActionTriggerred: Bool = false
         private var holdActionTimer: Timer?
         
+        public override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
+            var bounds = self.bounds
+            if let hitTestEdgeInsets = self.component?.hitTestEdgeInsets {
+                bounds = bounds.insetBy(dx: hitTestEdgeInsets.left, dy: hitTestEdgeInsets.top)
+            }
+            return bounds.contains(point)
+        }
+        
         override init(frame: CGRect) {
             self.contentView = ComponentHostView<Empty>()
             self.contentView.isUserInteractionEnabled = false
diff --git a/submodules/StatisticsUI/Sources/StarsTransactionItem.swift b/submodules/StatisticsUI/Sources/StarsTransactionItem.swift
@@ -347,7 +347,7 @@ final class StarsTransactionItemNode: ListViewItemNode, ItemListItemNode {
                             theme: item.presentationData.theme,
                             title: AnyComponent(VStack(titleComponents, alignment: .left, spacing: 2.0)),
                             contentInsets: UIEdgeInsets(top: 9.0, left: 0.0, bottom: 8.0, right: 0.0),
-                            leftIcon: .custom(AnyComponentWithIdentity(id: "avatar", component: AnyComponent(StarsAvatarComponent(context: item.context, theme: item.presentationData.theme, peer: .transactionPeer(item.transaction.peer), photo: nil, media: [], uniqueGift: nil, backgroundColor: item.presentationData.theme.list.itemBlocksBackgroundColor))), false),
+                            leftIcon: .custom(AnyComponentWithIdentity(id: "avatar", component: AnyComponent(StarsAvatarComponent(context: item.context, theme: item.presentationData.theme, peer: .transactionPeer(item.transaction.peer), photo: nil, media: [], gift: nil, backgroundColor: item.presentationData.theme.list.itemBlocksBackgroundColor))), false),
                             icon: nil,
                             accessory: .custom(ListActionItemComponent.CustomAccessory(component: AnyComponentWithIdentity(id: "label", component: AnyComponent(StarsLabelComponent(text: itemLabel, iconName: itemIconName, iconColor: itemIconColor))), insets: UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 16.0))),
                             action: { [weak self] _ in
diff --git a/submodules/TelegramUI/Components/CameraScreen/Sources/CaptureControlsComponent.swift b/submodules/TelegramUI/Components/CameraScreen/Sources/CaptureControlsComponent.swift
@@ -1411,6 +1411,7 @@ final class CaptureControlsComponent: Component {
                 transition.setAlpha(view: bottomSettingsButtonView, alpha: !isLiveStream || isLiveActive || isRecording || isTransitioning || hideControls ? 0.0 : 1.0)
             }
             
+            var hitTestEdgeInsets: UIEdgeInsets?
             var blobState: ShutterBlobView.BlobState
             switch component.shutterState {
             case .generic, .disabled:
@@ -1423,6 +1424,7 @@ final class CaptureControlsComponent: Component {
                 blobState = self.panBlobState ?? .video
             case .live:
                 blobState = .live
+                hitTestEdgeInsets = UIEdgeInsets(top: 0.0, left: -130.0, bottom: 0.0, right: -130.0)
             }
             
             let shutterButtonSize = self.shutterButtonView.update(
@@ -1451,7 +1453,7 @@ final class CaptureControlsComponent: Component {
                             component.shutterTapped()
                         },
                         highlightedAction: self.shutterHightlightedAction
-                    ).minSize(maximumShutterSize)
+                    ).minSize(maximumShutterSize).withHitTestEdgeInsets(hitTestEdgeInsets)
                 ),
                 environment: {},
                 containerSize: availableSize
diff --git a/submodules/TelegramUI/Components/Gifts/GiftViewScreen/Sources/GiftWithdrawAlertController.swift b/submodules/TelegramUI/Components/Gifts/GiftViewScreen/Sources/GiftWithdrawAlertController.swift
@@ -177,7 +177,7 @@ private final class GiftWithdrawAlertContentNode: AlertContentNode {
                     peer: .transactionPeer(.fragment),
                     photo: nil,
                     media: [],
-                    uniqueGift: nil,
+                    gift: nil,
                     backgroundColor: .clear,
                     size: avatarSize
                 )
diff --git a/submodules/TelegramUI/Components/GlassBarButtonComponent/Sources/GlassBarButtonComponent.swift b/submodules/TelegramUI/Components/GlassBarButtonComponent/Sources/GlassBarButtonComponent.swift
@@ -64,7 +64,7 @@ public final class GlassBarButtonComponent: Component {
         private let containerView: UIView
         private let genericContainerView: UIView
         private let genericBackgroundView: SimpleGlassView
-        private let glassContainerView: GlassBackgroundContainerView
+        private let glassContainerView: UIView
         private var glassBackgroundView: GlassBackgroundView?
         private var componentView: ComponentView<Empty>?
         
@@ -74,7 +74,7 @@ public final class GlassBarButtonComponent: Component {
             self.containerView = UIView()
             self.genericContainerView = UIView()
             self.genericBackgroundView = SimpleGlassView()
-            self.glassContainerView = GlassBackgroundContainerView()
+            self.glassContainerView = UIView()
             
             super.init(frame: frame)
             
@@ -189,9 +189,9 @@ public final class GlassBarButtonComponent: Component {
             transition.setAlpha(view: self.genericContainerView, alpha: genericAlpha)
             transition.setFrame(view: self.genericContainerView, frame: bounds)
             
-            transition.setAlpha(view: self.glassContainerView, alpha: glassAlpha)
+            //transition.setAlpha(view: self.glassContainerView, alpha: glassAlpha)
             transition.setFrame(view: self.glassContainerView, frame: bounds)
-            self.glassContainerView.update(size: bounds.size, isDark: component.isDark, transition: transition)
+            //self.glassContainerView.update(size: bounds.size, isDark: component.isDark, transition: transition)
             
             transition.setFrame(view: self.genericBackgroundView, frame: bounds)
             
@@ -204,7 +204,7 @@ public final class GlassBarButtonComponent: Component {
                     glassBackgroundTransition = .immediate
                     glassBackgroundView = GlassBackgroundView()
                     glassBackgroundView.isUserInteractionEnabled = false
-                    self.glassContainerView.contentView.addSubview(glassBackgroundView)
+                    self.glassContainerView.addSubview(glassBackgroundView)
                     self.glassBackgroundView = glassBackgroundView
                     
                     transition.animateAlpha(view: glassBackgroundView, from: 0.0, to: 1.0)
diff --git a/submodules/TelegramUI/Components/Stars/StarsAvatarComponent/Sources/StarsAvatarComponent.swift b/submodules/TelegramUI/Components/Stars/StarsAvatarComponent/Sources/StarsAvatarComponent.swift
@@ -24,7 +24,7 @@ public final class StarsAvatarComponent: Component {
     let peer: StarsAvatarComponent.Peer?
     let photo: TelegramMediaWebFile?
     let media: [Media]
-    let uniqueGift: StarGift.UniqueGift?
+    let gift: StarGift?
     let backgroundColor: UIColor
     let size: CGSize?
 
@@ -34,7 +34,7 @@ public final class StarsAvatarComponent: Component {
         peer: StarsAvatarComponent.Peer?,
         photo: TelegramMediaWebFile?,
         media: [Media],
-        uniqueGift: StarGift.UniqueGift?,
+        gift: StarGift?,
         backgroundColor: UIColor,
         size: CGSize? = nil
     ) {
@@ -43,7 +43,7 @@ public final class StarsAvatarComponent: Component {
         self.peer = peer
         self.photo = photo
         self.media = media
-        self.uniqueGift = uniqueGift
+        self.gift = gift
         self.backgroundColor = backgroundColor
         self.size = size
     }
@@ -64,7 +64,7 @@ public final class StarsAvatarComponent: Component {
         if !areMediaArraysEqual(lhs.media, rhs.media) {
             return false
         }
-        if lhs.uniqueGift != rhs.uniqueGift {
+        if lhs.gift != rhs.gift {
             return false
         }
         if lhs.backgroundColor != rhs.backgroundColor {
@@ -121,8 +121,17 @@ public final class StarsAvatarComponent: Component {
             var dimensions = size
             
             var didSetup = false
-            if let gift = component.uniqueGift {
+            if let gift = component.gift {
                 let giftFrame = CGRect(origin: .zero, size: size)
+                
+                var subject: GiftItemComponent.Subject
+                switch gift {
+                case let .generic(gift):
+                    subject = .starGift(gift: gift, price: "")
+                case let .unique(gift):
+                    subject = .uniqueGift(gift: gift, price: nil)
+                }
+                
                 let _ = self.giftView.update(
                     transition: .immediate,
                     component: AnyComponent(
@@ -131,7 +140,7 @@ public final class StarsAvatarComponent: Component {
                             theme: component.theme,
                             strings: component.context.sharedContext.currentPresentationData.with { $0 }.strings,
                             peer: nil,
-                            subject: .uniqueGift(gift: gift, price: nil),
+                            subject: subject,
                             mode: .thumbnail
                         )
                     ),
diff --git a/submodules/TelegramUI/Components/Stars/StarsTransactionScreen/Sources/StarsTransactionScreen.swift b/submodules/TelegramUI/Components/Stars/StarsTransactionScreen/Sources/StarsTransactionScreen.swift
@@ -214,6 +214,7 @@ private final class StarsTransactionSheetContent: CombinedComponent {
             var photo: TelegramMediaWebFile?
             var transactionStatus: (String, UIColor)? = nil
             var isGift = false
+            var isGiftAuctionBid = false
             var isSubscription = false
             var isSubscriber = false
             var isSubscriptionFee = false
@@ -356,6 +357,7 @@ private final class StarsTransactionSheetContent: CombinedComponent {
                     case .generic:
                         if transaction.flags.contains(.isStarGiftAuctionBid) {
                             titleText = strings.Stars_Transaction_GiftAuctionBid
+                            isGiftAuctionBid = true
                         } else {
                             titleText = strings.Stars_Transaction_Gift_Title
                         }
@@ -927,7 +929,7 @@ private final class StarsTransactionSheetContent: CombinedComponent {
                 ))
             }
             
-            if isGift, toPeer == nil {
+            if isGift && !isGiftAuctionBid, toPeer == nil {
                 tableItems.append(.init(
                     id: "from",
                     title: strings.Stars_Transaction_From,
@@ -950,7 +952,7 @@ private final class StarsTransactionSheetContent: CombinedComponent {
                         )
                     )
                 ))
-            } else if let toPeer, !isRefProgram {
+            } else if let toPeer, !isRefProgram && !isGiftAuctionBid {
                 let title: String
                 if isGiftUpgrade {
                     title = strings.Stars_Transaction_GiftFrom
@@ -2438,7 +2440,7 @@ private final class PeerCellComponent: Component {
             let avatarNaturalSize = self.avatar.update(
                 transition: .immediate,
                 component: AnyComponent(
-                    StarsAvatarComponent(context: component.context, theme: component.theme, peer: .transactionPeer(peer), photo: nil, media: [], uniqueGift: nil, backgroundColor: .clear)
+                    StarsAvatarComponent(context: component.context, theme: component.theme, peer: .transactionPeer(peer), photo: nil, media: [], gift: nil, backgroundColor: .clear)
                 ),
                 environment: {},
                 containerSize: CGSize(width: 40.0, height: 40.0)
diff --git a/submodules/TelegramUI/Components/Stars/StarsTransactionsScreen/Sources/StarsTransactionsListPanelComponent.swift b/submodules/TelegramUI/Components/Stars/StarsTransactionsScreen/Sources/StarsTransactionsListPanelComponent.swift
@@ -301,7 +301,7 @@ final class StarsTransactionsListPanelComponent: Component {
                     var itemDate: String
                     var itemPeer: StarsAvatarComponent.Peer = .transactionPeer(item.peer)
                     var itemFile: TelegramMediaFile?
-                    var uniqueGift: StarGift.UniqueGift?
+                    var itemGift: StarGift?
                     switch item.peer {
                     case let .peer(peer):
                         if let months = item.premiumGiftMonths {
@@ -325,17 +325,18 @@ final class StarsTransactionsListPanelComponent: Component {
                             if item.flags.contains(.isStarGiftAuctionBid), case let .generic(gift) = starGift {
                                 itemTitle = gift.title ?? "Gift"
                                 itemSubtitle = environment.strings.Stars_Intro_Transaction_GiftAuctionBid
+                                itemGift = starGift
                             } else if item.flags.contains(.isStarGiftPrepaidUpgrade) {
                                 itemTitle = peer.displayTitle(strings: environment.strings, displayOrder: .firstLast)
                                 itemSubtitle = environment.strings.Stars_Intro_Transaction_PrepaidGiftUpgrade
                             } else if item.flags.contains(.isStarGiftDropOriginalDetails), case let .unique(gift) = starGift {
                                 itemTitle = "\(gift.title) #\(presentationStringsFormattedNumber(gift.number, environment.dateTimeFormat.groupingSeparator))"
                                 itemSubtitle = environment.strings.Stars_Intro_Transaction_GiftDropOriginalDetails
-                                uniqueGift = gift
+                                itemGift = starGift
                             } else if item.flags.contains(.isStarGiftUpgrade), case let .unique(gift) = starGift {
                                 itemTitle = "\(gift.title) #\(presentationStringsFormattedNumber(gift.number, environment.dateTimeFormat.groupingSeparator))"
                                 itemSubtitle = environment.strings.Stars_Intro_Transaction_GiftUpgrade
-                                uniqueGift = gift
+                                itemGift = starGift
                             } else {
                                 itemTitle = peer.displayTitle(strings: environment.strings, displayOrder: .firstLast)
                                 switch starGift {
@@ -526,7 +527,7 @@ final class StarsTransactionsListPanelComponent: Component {
                             theme: environment.theme,
                             title: AnyComponent(VStack(titleComponents, alignment: .left, spacing: 2.0)),
                             contentInsets: UIEdgeInsets(top: 9.0, left: environment.containerInsets.left, bottom: 8.0, right: environment.containerInsets.right),
-                            leftIcon: .custom(AnyComponentWithIdentity(id: "avatar", component: AnyComponent(StarsAvatarComponent(context: component.context, theme: environment.theme, peer: itemPeer, photo: item.photo, media: item.media, uniqueGift: uniqueGift, backgroundColor: environment.theme.list.plainBackgroundColor))), false),
+                            leftIcon: .custom(AnyComponentWithIdentity(id: "avatar", component: AnyComponent(StarsAvatarComponent(context: component.context, theme: environment.theme, peer: itemPeer, photo: item.photo, media: item.media, gift: itemGift, backgroundColor: environment.theme.list.plainBackgroundColor))), false),
                             icon: nil,
                             accessory: .custom(ListActionItemComponent.CustomAccessory(component: AnyComponentWithIdentity(id: "label", component: AnyComponent(StarsLabelComponent(text: itemLabel, iconName: itemIconName, iconColor: itemIconColor))), insets: UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 16.0))),
                             action: { [weak self] _ in
diff --git a/submodules/TelegramUI/Components/Stars/StarsTransactionsScreen/Sources/StarsTransactionsScreen.swift b/submodules/TelegramUI/Components/Stars/StarsTransactionsScreen/Sources/StarsTransactionsScreen.swift

Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,10 @@ final class AttachmentTextInputActionButtonsNode: ASDisplayNode, ChatSendMessage`
`152`	`152`	`}`
`153`	`153`	`titleOffset -= 2.0`
`154`	`154`	`buttonInset = 14.0`
	`155`	`+ self.iconNode.isHidden = true`
`155`	`156`	`} else {`
`156`	`157`	`segments.append(.text(0, NSAttributedString(string: text, font: Font.semibold(17.0), textColor: interfaceState.theme.chat.inputPanel.actionControlForegroundColor)))`
	`158`	`+ self.iconNode.isHidden = false`
`157`	`159`	`}`
`158`	`160`	`self.textNode.segments = segments`
`159`	`161`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ private final class GiftWithdrawAlertContentNode: AlertContentNode {`
`177`	`177`	`peer: .transactionPeer(.fragment),`
`178`	`178`	`photo: nil,`
`179`	`179`	`media: [],`
`180`		`- uniqueGift: nil,`
	`180`	`+ gift: nil,`
`181`	`181`	`backgroundColor: .clear,`
`182`	`182`	`size: avatarSize`
`183`	`183`	`)`