Merge commit 'ee0c0ec3e5979ede0ee153aa60801e33ce7d98b6'

This commit is contained in:
Ali
2023-10-19 00:11:12 +04:00
61 changed files with 1291 additions and 870 deletions

View File

@@ -1496,9 +1496,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
animationCache: animationCache,
animationRenderer: animationRenderer,
isStandalone: false,
isStatusSelection: false,
isReactionSelection: true,
isEmojiSelection: false,
subject: .reaction,
hasTrending: false,
topReactionItems: reactionItems,
areUnicodeEmojiEnabled: false,
@@ -11002,7 +11000,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
guard let strongSelf = self, let peerId = strongSelf.chatLocation.peerId else {
return
}
strongSelf.presentAttachmentPremiumGift()
strongSelf.presentAttachmentMenu(subject: .gift)
Queue.mainQueue().after(0.5) {
let _ = ApplicationSpecificNotice.incrementDismissedPremiumGiftSuggestion(accountManager: strongSelf.context.sharedContext.accountManager, peerId: peerId).startStandalone()
}
@@ -13457,10 +13455,6 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
})
}
func presentAttachmentPremiumGift() {
self.presentAttachmentMenu(subject: .gift)
}
enum AttachMenuSubject {
case `default`
case edit(mediaOptions: MessageMediaEditingOptions, mediaReference: AnyMediaReference)
@@ -13788,7 +13782,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
let _ = currentLocationController.swap(controller)
})
case .contact:
let contactsController = ContactSelectionControllerImpl(ContactSelectionControllerParams(context: strongSelf.context, updatedPresentationData: strongSelf.updatedPresentationData, title: { $0.Contacts_Title }, displayDeviceContacts: true, multipleSelection: true))
let contactsController = ContactSelectionControllerImpl(ContactSelectionControllerParams(context: strongSelf.context, updatedPresentationData: strongSelf.updatedPresentationData, title: { $0.Contacts_Title }, displayDeviceContacts: true, multipleSelection: true, requirePhoneNumbers: true))
contactsController.presentScheduleTimePicker = { [weak self] completion in
if let strongSelf = self {
strongSelf.presentScheduleTimePicker(completion: completion)