Merge commit '0e1b60be249a798e0a5c2ff6616ed2437c8a95db'

Author: Isaac

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

@@ -15423,3 +15423,6 @@ Error: %8$@";
 "ChatList.AlertResumeLiveStreamTitle" = "Resume Live Stream";
 "ChatList.AlertResumeLiveStreamText" = "Do you want to resume an existing Live Stream?";
 "ChatList.AlertResumeLiveStreamAction" = "Resume";
+
+"Gift.Options.Gift.JoinAuction" = "Join";
+"Gift.Options.Gift.ViewAuction" = "View";

submodules/Components/SheetComponent/Sources/SheetComponent.swift

@@ -400,6 +400,10 @@ public final class SheetComponent<ChildEnvironmentType: Sendable & Equatable>: C
             self.component = component
             self.currentHasInputHeight = sheetEnvironment.hasInputHeight
 
+            if self.isAnimatingOut {
+                return availableSize
+            }
+            
             var glassInset: CGFloat = 0.0
             var topCornerRadius: CGFloat
             var bottomCornerRadius: CGFloat

submodules/TelegramBaseController/Sources/GiftAuctionAccessoryPanel.swift

@@ -106,22 +106,6 @@ final class GiftAuctionAccessoryPanel: ASDisplayNode {
         let titleText: String = self.strings.ChatList_Auctions_ActiveAuction(Int32(self.states.count))
         titleItems.append(AnyComponentWithIdentity(id: "label", component: AnyComponent(MultilineTextComponent(text: .plain(NSAttributedString(string: titleText, font: titleFont, textColor: self.theme.rootController.navigationBar.primaryTextColor))))))
 
-        let titleSize = self.title.update(
-            transition: .immediate,
-            component: AnyComponent(
-                HStack(titleItems, spacing: 3.0, alignment: .left)
-            ),
-            environment: {},
-            containerSize: size
-        )
-        let titleFrame = CGRect(origin: CGPoint(x: 16.0, y: 9.0), size: titleSize)
-        if let titleView = self.title.view {
-            if titleView.superview == nil {
-                self.contentNode.view.addSubview(titleView)
-            }
-            titleView.frame = titleFrame
-        }
-        
         let subtitleText: String
         var subtitleTextColor = self.theme.rootController.navigationBar.secondaryTextColor
         var isOutbid = false
@@ -195,20 +179,6 @@ final class GiftAuctionAccessoryPanel: ASDisplayNode {
             buttonAnimatedTitleItems.append(AnimatedTextComponent.Item(id: "view", content: .text(self.strings.ChatList_Auctions_View)))
         }
 
-        let subtitleSize = self.subtitle.update(
-            transition: .immediate,
-            component: AnyComponent(MultilineTextComponent(text: .plain(NSAttributedString(string: subtitleText, font: subtitleFont, textColor: subtitleTextColor)))),
-            environment: {},
-            containerSize: size
-        )
-        let subtitleFrame = CGRect(origin: CGPoint(x: 16.0, y: 29.0), size: subtitleSize)
-        if let subtitleView = self.subtitle.view {
-            if subtitleView.superview == nil {
-                self.contentNode.view.addSubview(subtitleView)
-            }
-            subtitleView.frame = subtitleFrame
-        }
-                
         let buttonSize = self.button.update(
             transition: .spring(duration: 0.2),
             component: AnyComponent(
@@ -254,6 +224,36 @@ final class GiftAuctionAccessoryPanel: ASDisplayNode {
             buttonView.frame = buttonFrame
         }
 
+        let titleSize = self.title.update(
+            transition: .immediate,
+            component: AnyComponent(
+                HStack(titleItems, spacing: 3.0, alignment: .left)
+            ),
+            environment: {},
+            containerSize: CGSize(width: size.width - buttonSize.width - 48.0, height: size.height)
+        )
+        let titleFrame = CGRect(origin: CGPoint(x: 16.0, y: 9.0), size: titleSize)
+        if let titleView = self.title.view {
+            if titleView.superview == nil {
+                self.contentNode.view.addSubview(titleView)
+            }
+            titleView.frame = titleFrame
+        }
+        
+        let subtitleSize = self.subtitle.update(
+            transition: .immediate,
+            component: AnyComponent(MultilineTextComponent(text: .plain(NSAttributedString(string: subtitleText, font: subtitleFont, textColor: subtitleTextColor)))),
+            environment: {},
+            containerSize: CGSize(width: size.width - buttonSize.width - 40.0, height: size.height)
+        )
+        let subtitleFrame = CGRect(origin: CGPoint(x: 16.0, y: 29.0), size: subtitleSize)
+        if let subtitleView = self.subtitle.view {
+            if subtitleView.superview == nil {
+                self.contentNode.view.addSubview(subtitleView)
+            }
+            subtitleView.frame = subtitleFrame
+        }
+        
         transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: UIScreenPixel)))
     }
 

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

@@ -658,7 +658,11 @@ final class GiftOptionsScreenComponent: Component {
                         switch gift {
                         case let .generic(gift):
                             if gift.flags.contains(.isAuction) {
-                                subject = .starGift(gift: gift, price: "Join")
+                                var action = environment.strings.Gift_Options_Gift_JoinAuction
+                                if gift.availability?.remains == 0 {
+                                    action = environment.strings.Gift_Options_Gift_ViewAuction
+                                }
+                                subject = .starGift(gift: gift, price: action)
                             } else if let availability = gift.availability, availability.remains == 0, let minResaleStars = availability.minResaleStars {
                                 let priceString = presentationStringsFormattedNumber(Int32(minResaleStars), environment.dateTimeFormat.groupingSeparator)
                                 if let resaleConfiguration = self.resaleConfiguration, minResaleStars == resaleConfiguration.starGiftResaleMaxStarsAmount || availability.resale == 1 {
@@ -1823,6 +1827,14 @@ final class GiftOptionsScreenComponent: Component {
                 }
 
                 var filteredStarGifts = starGifts
+                if peerId.namespace == Namespaces.Peer.CloudChannel {
+                    filteredStarGifts = filteredStarGifts?.filter { gift in
+                        if case let .generic(gift) = gift, gift.availability != nil {
+                            return false
+                        }
+                        return true
+                    }
+                }
                 if let disallowedGifts = self.disallowedGifts, !disallowedGifts.isEmpty {
                     filteredStarGifts = filteredStarGifts?.filter { gift in
                         if case let .generic(gift) = gift {