Various improvements

Author: laktyushin

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

@@ -15226,8 +15226,10 @@ Error: %8$@";
 "Gift.AuctionBid.AddMoreStars" = "Add at least %@ to increase your bid.";
 "Gift.AuctionBid.AddMoreStars.Stars_1" = "%@ Star";
 "Gift.AuctionBid.AddMoreStars.Stars_any" = "%@ Stars";
+"Gift.AuctionBid.AddMoreStars.Set" = "Set";
 "Gift.AuctionBid.Top" = "TOP %@";
 "Gift.AuctionBid.Custom" = "Custom";
+"Gift.AuctionBid.MinimumBidIncreased" = "The minimum bid increased to **%@**.";
 
 "Gift.AuctionBid.CustomBid.Title" = "Place a Custom Bid";
 "Gift.AuctionBid.CustomBid.Text" = "If you fall below the top %@, your bid will roll over to the next drop.";

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

@@ -353,7 +353,7 @@ final class GiftOptionsScreenComponent: Component {
                         return
                     }
 
-                    if let perUserLimit = gift.perUserLimit, perUserLimit.remains == 0 {
+                    if let perUserLimit = gift.perUserLimit, perUserLimit.remains == 0 && (gift.availability?.resale ?? 0) == 0 {
                         let text = environment.strings.Gift_Options_Gift_BuyLimitReached(perUserLimit.total)
                         let presentationData = component.context.sharedContext.currentPresentationData.with { $0 }
                         let controller = UndoOverlayController(presentationData: presentationData, content: .sticker(context: component.context, file: gift.file, loop: true, title: nil, text: text, undoText: nil, customAction: nil), action: { _ in return false })
@@ -447,7 +447,7 @@ final class GiftOptionsScreenComponent: Component {
                             }
                         }))
                     } else {
-                        if let availability = gift.availability, availability.remains == 0 {
+                        if let availability = gift.availability, availability.remains == 0 || gift.perUserLimit?.remains == 0 || component.peerId.namespace == Namespaces.Peer.CloudChannel {
                             if availability.resale > 0 {
                                 let storeController = component.context.sharedContext.makeGiftStoreController(
                                     context: component.context,
@@ -611,7 +611,7 @@ final class GiftOptionsScreenComponent: Component {
                                     text = environment.strings.Gift_Options_Gift_Auction
                                     ribbonColor = .orange
                                     outline = .orange
-                                } else if let perUserLimit = gift.perUserLimit {
+                                } else if let perUserLimit = gift.perUserLimit, component.peerId.namespace != Namespaces.Peer.CloudChannel {
                                     text = environment.strings.Gift_Options_Gift_Limited_Left(perUserLimit.remains)
                                 } else {
                                     text = environment.strings.Gift_Options_Gift_Limited
@@ -1831,7 +1831,7 @@ 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 {
+                        if case let .generic(gift) = gift, let availability = gift.availability, availability.resale == 0 {
                             return false
                         }
                         return true

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

@@ -1528,10 +1528,15 @@ private final class GiftAuctionBidScreenComponent: Component {
                             title: nil,
                             text: presentationData.strings.Gift_AuctionBid_AddMoreStars(presentationData.strings.Gift_AuctionBid_AddMoreStars_Stars(Int32(clamping: myMinBidAmount - myBidAmount))).string,
                             timeout: nil,
-                            customUndoText: nil
+                            customUndoText: presentationData.strings.Gift_AuctionBid_AddMoreStars_Set
                         ),
                         position: .bottom,
-                        action: { _ in return true }
+                        action: { [weak self] action in
+                            if let self, case .undo = action {
+                                self.resetSliderValue(component: self.component, forceMinimum: true)
+                            }
+                            return true
+                        }
                     ),
                     in: .current
                 )
@@ -1613,8 +1618,28 @@ private final class GiftAuctionBidScreenComponent: Component {
                     return
                 }
 
+                HapticFeedback().error()
+                
+                let currentValue = self.amount.realValue
                 self.component?.context.starsContext?.load(force: true)
-                self.resetSliderValue()
+                self.resetSliderValue(component: self.component, forceMinimum: true)
+                
+                if self.amount.realValue > currentValue {
+                    controller.present(
+                        UndoOverlayController(
+                            presentationData: presentationData,
+                            content: .info(
+                                title: nil,
+                                text: presentationData.strings.Gift_AuctionBid_MinimumBidIncreased(presentationData.strings.Gift_AuctionBid_AddMoreStars_Stars(Int32(clamping: self.amount.realValue))).string,
+                                timeout: nil,
+                                customUndoText: nil
+                            ),
+                            position: .bottom,
+                            action: { _ in return true }
+                        ),
+                        in: .current
+                    )
+                }
 
                 Queue.mainQueue().after(0.1) {
                     self.isLoading = false
@@ -1826,7 +1851,7 @@ private final class GiftAuctionBidScreenComponent: Component {
             self.environment?.controller()?.present(controller, in: .window(.root))
         }
 
-        func resetSliderValue(component: GiftAuctionBidScreenComponent? = nil) {
+        func resetSliderValue(component: GiftAuctionBidScreenComponent? = nil, forceMinimum: Bool = false) {
             guard let state = self.giftAuctionState else {
                 return
             }
@@ -1839,16 +1864,13 @@ private final class GiftAuctionBidScreenComponent: Component {
                 }
             }
             var currentValue = max(Int(minBidAmount), 100)
+            var minAllowedRealValue: Int64 = minBidAmount
             if let myBidAmount = state.myState.bidAmount {
-                if let component, let bidPeerId = state.myState.bidPeerId, bidPeerId != component.toPeerId, let myMinBidAmount = state.myState.minBidAmount {
+                if let component, let bidPeerId = state.myState.bidPeerId, bidPeerId != component.toPeerId || forceMinimum, let myMinBidAmount = state.myState.minBidAmount {
                     currentValue = Int(myMinBidAmount)
                 } else {
                     currentValue = Int(myBidAmount)
                 }
-            }
-            
-            var minAllowedRealValue: Int64 = minBidAmount
-            if let myBidAmount = state.myState.bidAmount {
                 minAllowedRealValue = myBidAmount
             }