Merge branch 'master' into stars-subscriptions

This commit is contained in:
Ilya Laktyushin
2024-07-30 11:29:42 +02:00
230 changed files with 13409 additions and 3710 deletions

View File

@@ -135,11 +135,11 @@ func openWebAppImpl(context: AccountContext, parentController: ViewController, u
}
}, didDismiss: { [weak parentController] in
if let parentController = parentController as? ChatControllerImpl {
let isFocused = parentController.chatDisplayNode.textInputPanelNode?.isFocused ?? false
parentController.chatDisplayNode.insertSubnode(parentController.chatDisplayNode.inputPanelContainerNode, aboveSubnode: parentController.chatDisplayNode.inputContextPanelContainer)
if isFocused {
parentController.chatDisplayNode.textInputPanelNode?.ensureFocused()
}
// let isFocused = parentController.chatDisplayNode.textInputPanelNode?.isFocused ?? false
// parentController.chatDisplayNode.insertSubnode(parentController.chatDisplayNode.inputPanelContainerNode, aboveSubnode: parentController.chatDisplayNode.inputContextPanelContainer)
// if isFocused {
// parentController.chatDisplayNode.textInputPanelNode?.ensureFocused()
// }
parentController.updateChatPresentationInterfaceState(interactive: false) { state in
return state.updatedForceInputCommandsHidden(false)
@@ -163,7 +163,7 @@ func openWebAppImpl(context: AccountContext, parentController: ViewController, u
var botId = peer.id
var botName = botName
var botAddress = ""
var botVerified = false
var botVerified = peer.isVerified
if case let .inline(bot) = source {
isInline = true
botId = bot.id