Merge commit 'a68bf9bcae16cc509dba84407f1eac82480a13dd'

This commit is contained in:
Isaac 2024-09-27 21:28:19 +08:00
commit bbf127b806
3 changed files with 4 additions and 3 deletions

View File

@ -468,7 +468,7 @@ public final class ChatEntityKeyboardInputNode: ChatInputNode {
|> distinctUntilChanged |> distinctUntilChanged
} }
public init(context: AccountContext, currentInputData: InputData, updatedInputData: Signal<InputData, NoError>, defaultToEmojiTab: Bool, opaqueTopPanelBackground: Bool = false, useOpaqueTheme: Bool = false, interaction: ChatEntityKeyboardInputNode.Interaction?, chatPeerId: PeerId?, stateContext: StateContext?) { public init(context: AccountContext, currentInputData: InputData, updatedInputData: Signal<InputData, NoError>, defaultToEmojiTab: Bool, opaqueTopPanelBackground: Bool = false, useOpaqueTheme: Bool = false, interaction: ChatEntityKeyboardInputNode.Interaction?, chatPeerId: PeerId?, stateContext: StateContext?, forceHasPremium: Bool = false) {
self.context = context self.context = context
self.currentInputData = currentInputData self.currentInputData = currentInputData
self.defaultToEmojiTab = defaultToEmojiTab self.defaultToEmojiTab = defaultToEmojiTab
@ -689,7 +689,7 @@ public final class ChatEntityKeyboardInputNode: ChatInputNode {
} }
} }
if file.isPremiumEmoji && !hasPremium && groupId != AnyHashable("peerSpecific") { if file.isPremiumEmoji && !hasPremium && groupId != AnyHashable("peerSpecific") && !forceHasPremium {
var animateInAsReplacement = false var animateInAsReplacement = false
if let currentUndoOverlayController = strongSelf.currentUndoOverlayController { if let currentUndoOverlayController = strongSelf.currentUndoOverlayController {
currentUndoOverlayController.dismissWithCommitActionAndReplacementAnimation() currentUndoOverlayController.dismissWithCommitActionAndReplacementAnimation()

View File

@ -914,7 +914,8 @@ final class GiftSetupScreenComponent: Component {
useOpaqueTheme: true, useOpaqueTheme: true,
interaction: self.inputMediaInteraction, interaction: self.inputMediaInteraction,
chatPeerId: nil, chatPeerId: nil,
stateContext: self.inputMediaNodeStateContext stateContext: self.inputMediaNodeStateContext,
forceHasPremium: true
) )
inputMediaNode.clipsToBounds = true inputMediaNode.clipsToBounds = true