Merge commit '8a46bdffce88e172d748b7c5d283a8129595591d' into beta

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/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, acquiredGifts: [GiftAuctionAcquiredGift]?) -> ViewController
-    func makeGiftAuctionViewScreen(context: AccountContext, auctionContext: GiftAuctionContext, completion: @escaping ([GiftAuctionAcquiredGift]?) -> Void) -> ViewController
+    func makeGiftAuctionBidScreen(context: AccountContext, toPeerId: EnginePeer.Id, text: String?, entities: [MessageTextEntity]?, hideName: Bool, auctionContext: GiftAuctionContext, acquiredGifts: Signal<[GiftAuctionAcquiredGift], NoError>?) -> ViewController
+    func makeGiftAuctionViewScreen(context: AccountContext, auctionContext: GiftAuctionContext, completion: @escaping (Signal<[GiftAuctionAcquiredGift], NoError>) -> Void) -> ViewController
     func makeGiftAuctionActiveBidsScreen(context: AccountContext) -> ViewController
 
     func makeStorySharingScreen(context: AccountContext, subject: StorySharingSubject, parentController: ViewController) -> ViewController

submodules/AccountContext/Sources/Premium.swift

@@ -347,3 +347,7 @@ public struct AccountFreezeConfiguration {
 public protocol GiftOptionsScreenProtocol {
 
 }
+
+public protocol GiftSetupScreenProtocol {
+    
+}

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

@@ -212,6 +212,7 @@ public func loginEmailSetupController(context: AccountContext, blocking: Bool, e
     }
 
     dismissEmailControllerImpl = { [weak emailController] in
+        dismiss()
         emailController?.dismiss()
     }
     return emailController

submodules/TelegramCore/Sources/TelegramEngine/Contacts/ImportContact.swift

@@ -36,7 +36,7 @@ func _internal_importContact(account: Account, firstName: String, lastName: Stri
                                 transaction.replaceContactPeerIds(peerIds)
                             }
                             if !noteText.isEmpty {
-                                transaction.updatePeerCachedData(peerIds: peerIds, update: { peerId, cachedData in
+                                transaction.updatePeerCachedData(peerIds: [peerId], update: { peerId, cachedData in
                                     (cachedData as? CachedUserData)?.withUpdatedNote(.init(text: noteText, entities: noteEntities))
                                 })
                             }
@@ -99,7 +99,7 @@ func _internal_addContactInteractively(account: Account, peerId: PeerId, firstNa
                     transaction.replaceContactPeerIds(peerIds)
                 }
                 if !noteText.isEmpty {
-                    transaction.updatePeerCachedData(peerIds: peerIds, update: { peerId, cachedData in
+                    transaction.updatePeerCachedData(peerIds: [peerId], update: { peerId, cachedData in
                         (cachedData as? CachedUserData)?.withUpdatedNote(.init(text: noteText, entities: noteEntities))
                     })
                 }

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

@@ -272,7 +272,7 @@ extension GiftAuctionContext.State.MyState {
     }
 }
 
-public struct GiftAuctionAcquiredGift {
+public struct GiftAuctionAcquiredGift: Equatable {
     public var nameHidden: Bool
     public let peer: EnginePeer
     public let date: Int32

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