Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Author: laktyushin

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

@@ -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()

submodules/TelegramUI/Components/Chat/ChatQrCodeScreen/Sources/ChatQrCodeScreen.swift

@@ -1940,7 +1940,9 @@ private class QrContentNode: ASDisplayNode, ContentNode {
             imageSide = 220.0
 
             if size.width > 375.0 {
-                if textLength > 12 {
+                if textLength > 18 {
+                    fontSize = 16.0
+                } else if textLength > 12 {
                     fontSize = 22.0
                 } else {
                     fontSize = 24.0

submodules/TelegramUI/Components/Contacts/NewContactScreen/Sources/NewContactScreen.swift

@@ -1058,15 +1058,15 @@ public class NewContactScreen: ViewControllerComponentContainer {
     fileprivate func complete(result: NewContactScreenComponent.Result) {
         let entities = generateChatInputTextEntities(result.note)
         if let peer = result.peer {
-            let _ = self.context.engine.contacts.addContactInteractively(
+            let _ = (self.context.engine.contacts.addContactInteractively(
                 peerId: peer.id,
                 firstName: result.firstName,
                 lastName: result.lastName,
                 phoneNumber: result.phoneNumber,
                 noteText: result.note.string,
                 noteEntities: entities,
                 addToPrivacyExceptions: result.addToPrivacyExceptions
-            ).startStandalone(completed: { [weak self] in
+            ) |> deliverOnMainQueue).startStandalone(completed: { [weak self] in
                 if !result.syncContactToPhone {
                     self?.completion(result.peer, nil, nil)
                 }