Merge branch 'master' into postbox-refactoring-1

This commit is contained in:
Ali
2021-09-13 16:32:01 +04:00
69 changed files with 1211 additions and 358 deletions

View File

@@ -250,10 +250,10 @@ func chatContextMenuItems(context: AccountContext, peerId: PeerId, promoInfo: Ch
updatedItems.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_Back, icon: { theme in
return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Back"), color: theme.contextMenu.primaryColor)
}, action: { c, _ in
c.setItems(chatContextMenuItems(context: context, peerId: peerId, promoInfo: promoInfo, source: source, chatListController: chatListController, joined: joined), minHeight: nil)
c.setItems(chatContextMenuItems(context: context, peerId: peerId, promoInfo: promoInfo, source: source, chatListController: chatListController, joined: joined) |> map { ContextController.Items(items: $0) }, minHeight: nil)
})))
c.setItems(.single(updatedItems), minHeight: nil)
c.setItems(.single(ContextController.Items(items: updatedItems)), minHeight: nil)
})))
}
}