Merge commit '0a5c043896d641e281476420f561216809608be5'

Author: Isaac

submodules/AccountContext/Sources/AccountContext.swift

@@ -1423,8 +1423,8 @@ public protocol SharedAccountContext: AnyObject {
     func makeGiftViewScreen(context: AccountContext, gift: StarGift.UniqueGift, shareStory: ((StarGift.UniqueGift) -> Void)?, openChatTheme: (() -> Void)?, dismissed: (() -> Void)?) -> ViewController
     func makeGiftWearPreviewScreen(context: AccountContext, gift: StarGift.UniqueGift) -> ViewController
     func makeGiftAuctionInfoScreen(context: AccountContext, auctionContext: GiftAuctionContext, completion: (() -> Void)?) -> ViewController
-    func makeGiftAuctionBidScreen(context: AccountContext, toPeerId: EnginePeer.Id, text: String?, entities: [MessageTextEntity]?, hideName: Bool, auctionContext: GiftAuctionContext) -> ViewController
-    func makeGiftAuctionViewScreen(context: AccountContext, auctionContext: GiftAuctionContext, completion: @escaping () -> Void) -> ViewController
+    func makeGiftAuctionBidScreen(context: AccountContext, toPeerId: EnginePeer.Id, text: String?, entities: [MessageTextEntity]?, hideName: Bool, auctionContext: GiftAuctionContext, acquiredGifts: [GiftAuctionAcquiredGift]?) -> ViewController
+    func makeGiftAuctionViewScreen(context: AccountContext, auctionContext: GiftAuctionContext, completion: @escaping ([GiftAuctionAcquiredGift]?) -> Void) -> ViewController
     func makeGiftAuctionActiveBidsScreen(context: AccountContext) -> ViewController
 
     func makeStorySharingScreen(context: AccountContext, subject: StorySharingSubject, parentController: ViewController) -> ViewController

submodules/TelegramBaseController/Sources/TelegramBaseController.swift

@@ -565,7 +565,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
                                 guard let self, let auction else {
                                     return
                                 }
-                                let controller = self.context.sharedContext.makeGiftAuctionBidScreen(context: self.context, toPeerId: auction.currentBidPeerId ?? self.context.account.peerId, text: nil, entities: nil, hideName: false, auctionContext: auction)
+                                let controller = self.context.sharedContext.makeGiftAuctionBidScreen(context: self.context, toPeerId: auction.currentBidPeerId ?? self.context.account.peerId, text: nil, entities: nil, hideName: false, auctionContext: auction, acquiredGifts: nil)
                                 self.push(controller)
                             })
                         }

submodules/TelegramCore/Sources/TelegramEngine/Payments/StarGiftsAuctions.swift

@@ -60,7 +60,7 @@ public final class GiftAuctionContext {
         }
 
         public struct MyState: Equatable {
-            public var isOutbid: Bool
+            public var isReturned: Bool
             public var bidAmount: Int64?
             public var bidDate: Int32?
             public var minBidAmount: Int64?
@@ -78,7 +78,11 @@ public final class GiftAuctionContext {
     public let gift: StarGift
 
     public var isActive: Bool {
-        return myState?.bidAmount != nil
+        if case .finished = auctionState {
+            return false
+        } else {
+            return myState?.bidAmount != nil
+        }
     }
 
     private let disposable = MetaDisposable()
@@ -132,7 +136,7 @@ public final class GiftAuctionContext {
 
     private var currentVersion: Int32 {
         var currentVersion: Int32 = 0
-        if case let  .ongoing(version, _, _, _, _, _, _, _, _, _) = self.auctionState {
+        if case let .ongoing(version, _, _, _, _, _, _, _, _, _) = self.auctionState {
             currentVersion = version
         }
         return currentVersion
@@ -180,7 +184,10 @@ public final class GiftAuctionContext {
     }
 
     func updateAuctionState(_ auctionState: GiftAuctionContext.State.AuctionState) {
-        self.auctionState = auctionState
+        if case let .ongoing(version, _, _, _, _, _, _, _, _, _) = auctionState, version < self.currentVersion {
+        } else {
+            self.auctionState = auctionState
+        }
         self.pushState()
     }
 
@@ -255,7 +262,7 @@ extension GiftAuctionContext.State.MyState {
     init(apiAuctionUserState: Api.StarGiftAuctionUserState) {
         switch apiAuctionUserState {
         case let .starGiftAuctionUserState(flags, bidAmount, bidDate, minBidAmount, bidPeerId, acquiredCount):
-            self.isOutbid = (flags & (1 << 1)) != 0
+            self.isReturned = (flags & (1 << 1)) != 0
             self.bidAmount = bidAmount
             self.bidDate = bidDate
             self.minBidAmount = minBidAmount

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

@@ -383,7 +383,8 @@ final class GiftOptionsScreenComponent: Component {
                                         text: nil,
                                         entities: nil,
                                         hideName: false,
-                                        auctionContext: auctionContext
+                                        auctionContext: auctionContext,
+                                        acquiredGifts: nil
                                     )
                                     mainController.push(giftController)
                                 } else {
@@ -415,11 +416,12 @@ final class GiftOptionsScreenComponent: Component {
                                         let giftController = component.context.sharedContext.makeGiftAuctionViewScreen(
                                             context: component.context,
                                             auctionContext: auctionContext,
-                                            completion: { [weak mainController] in
+                                            completion: { [weak mainController] acquiredGifts in
                                                 let controller = GiftSetupScreen(
                                                     context: context,
                                                     peerId: component.peerId,
                                                     subject: .starGift(gift, nil),
+                                                    auctionAcquiredGifts: acquiredGifts,
                                                     completion: nil
                                                 )
                                                 mainController?.push(controller)

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

@@ -46,17 +46,20 @@ private final class GiftSetupScreenComponent: Component {
     let context: AccountContext
     let peerId: EnginePeer.Id
     let subject: GiftSetupScreen.Subject
+    let auctionAcquiredGifts: [GiftAuctionAcquiredGift]?
     let completion: (() -> Void)?
 
     init(
         context: AccountContext,
         peerId: EnginePeer.Id,
         subject: GiftSetupScreen.Subject,
+        auctionAcquiredGifts: [GiftAuctionAcquiredGift]?,
         completion: (() -> Void)? = nil
     ) {
         self.context = context
         self.peerId = peerId
         self.subject = subject
+        self.auctionAcquiredGifts = auctionAcquiredGifts
         self.completion = completion
     }
 
@@ -479,7 +482,8 @@ private final class GiftSetupScreenComponent: Component {
                     text: textInputText.string,
                     entities: entities,
                     hideName: self.hideName,
-                    auctionContext: auctionContext
+                    auctionContext: auctionContext,
+                    acquiredGifts: component.auctionAcquiredGifts
                 )
                 environment.controller()?.dismiss()
                 navigationController.pushViewController(controller)
@@ -2020,6 +2024,7 @@ public class GiftSetupScreen: ViewControllerComponentContainer {
         context: AccountContext,
         peerId: EnginePeer.Id,
         subject: Subject,
+        auctionAcquiredGifts: [GiftAuctionAcquiredGift]? = nil,
         completion: (() -> Void)? = nil
     ) {
         self.context = context
@@ -2028,6 +2033,7 @@ public class GiftSetupScreen: ViewControllerComponentContainer {
             context: context,
             peerId: peerId,
             subject: subject,
+            auctionAcquiredGifts: auctionAcquiredGifts,
             completion: completion
         ), navigationBarAppearance: .none, theme: .default)
 

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

@@ -331,7 +331,7 @@ private final class GiftAuctionActiveBidsScreenComponent: Component {
                                         guard let self, let component = self.component, let auction, let controller = environment.controller(), let navigationController = controller.navigationController as? NavigationController else {
                                             return
                                         }
-                                        let bidController = component.context.sharedContext.makeGiftAuctionBidScreen(context: component.context, toPeerId: auction.currentBidPeerId ?? component.context.account.peerId, text: nil, entities: nil, hideName: false, auctionContext: auction)
+                                        let bidController = component.context.sharedContext.makeGiftAuctionBidScreen(context: component.context, toPeerId: auction.currentBidPeerId ?? component.context.account.peerId, text: nil, entities: nil, hideName: false, auctionContext: auction, acquiredGifts: nil)
                                         navigationController.pushViewController(bidController)
                                     })
                                 }